Merge branch 'master' of https://github.com/devcongress/forge.devcong…

…ress.com

* 'master' of https://github.com/devcongress/forge.devcongress.com:
  Deleted link to program in templates/application.
  Removed /program.
  Removed /program.
  Ignore Vim meta files.
  Ignore Vim meta files.
  Added SQLAlchemy, Hacker model.
  Added the programming challenge: FizzBuzz.
  Answered some of the FAQs. Reworded a few others.
  Merge branch 'master' of https://github.com/devcongress/forge.devcongress.com

.gitignore

@@ -45,12 +45,11 @@ coverage.xml
 # Rope
 .ropeproject
 
-# Django stuff:
-*.log
-*.pot
-
 # Sphinx documentation
 docs/_build/
 
 # Virtualenv
 venv/
+
+# Vim
+.sw*

app.py

@@ -41,10 +41,6 @@ def teach():
   else:
     pass
 
-@app.route('/program')
-def program():
-    return render_template('program.html')
-
 
 # Models, models.
 class Hacker(db.Model):

templates/application.html

@@ -20,16 +20,13 @@
 	  <!-- Navigation & Logo-->
         <div class="mainmenu-wrapper">
 	        <div class="container">
-	        	
+
 		        <nav id="mainmenu" class="mainmenu">
 					<ul>
 						<li class="logo-wrapper"><a href="{{ url_for('home') }}">Forge</a></li>
 						<li {{ active(url_for('home')) }}>
 							<a href="{{ url_for('home') }}">Home</a>
 						</li>
-						<li {{ active(url_for('program')) }}>
-							<a href="{{ url_for('program') }}">The Program</a>
-						</li>
 						<li {{ active(url_for('faq')) }}>
 							<a href="{{ url_for('faq') }}">FAQ</a>
 						</li>
@@ -44,7 +41,7 @@
 
 			</div>
 		</div>
-	
+
 	{% block banner %}
 	<section class="featured">
 			<div class="container">
@@ -57,7 +54,7 @@ <h2 class="slogan">A thing for hackers</h2>
 							At Forge we believe that learning should be self-driven, therefore
 							we want to give you the opportunity to be transformed into the
 							kind of programmer you always wanted.
-							</p>	
+							</p>
 							<a class="btn btn-forge-white" href="{{ url_for('apply') }}">Start Now</a>
 						</div>
 					</div>
@@ -66,7 +63,6 @@ <h2 class="slogan">A thing for hackers</h2>
 		</section>
 		{% endblock banner %}
 
-
 		{% block body %}
 	    <div class="section" id="section-about">
 			<div class="container">
@@ -122,28 +118,17 @@ <h3>Contribute</h3>
 				</div>
 			</div>
 		</div>
-		<!-- Application Form -->
-		<!-- <div class="section forge-section-head" id="section-register">
-			<div class="container">
-				<div class="row">
-					<div class="col-md-12">
-							<h1>Up your software engineering skills in 12 weeks</h1>
-					</div>
-				</div>
-			</div>
-		</div> -->
 	    <section class="section program">
 			<div class="container">
 				<div class="row text-center">
 					<h1>Up your software engineering skills in 12 weeks</h1>
 					<p>
-						Forge is a full-time 12-week intensive programme that is designed 
-						to help you improve your software engineering skills. 
+						Forge is a full-time 12-week intensive programme that is designed
+						to help you improve your software engineering skills.
 						Over twelve weeks, you'll learn the neccessary skills needed to make
 						you a software engineer. You will learn computer science fundamentals
 						and software engineering best practices
 					</p>
-					<a class="btn btn-forge-white" href="{{ url_for('program') }}">The Program Details</a>
 				</div>
 			</div>
 		</section>
@@ -160,7 +145,7 @@ <h1>Learn from the experts</h1>
 					<a class="btn btn-forge-white" href="{{ url_for('teach') }}">Be an instructor</a>
 				</div>
 			</div>
-		</section> 
+		</section>
 		{% endblock body %}
 		<!-- Footer -->
 		{% block footer %}
@@ -186,7 +171,6 @@ <h1>Learn from the experts</h1>
 							<a href="https://facebook.com/devcongress"><i class="fa fa-facebook fa-2x forge-right-pad"></i></a>
 							<a href="https://twitter.com/devcongress"><i class="fa fa-twitter fa-2x forge-right-pad"></i></a>
 							<a href="https://github.com/devcongress"><i class="fa fa-github fa-2x forge-right-pad"></i></a>
-
 						</ul>
 					</div>