Merge branch 'master' of https://github.com/devcongress/forge.devcong… · devcongress/forge.devcongress.com@4a797dc · GitHub

Commit

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

Browse files

…ress.com

* 'master' of https://github.com/devcongress/forge.devcongress.com:
  Removed /program.
  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

Conflicts:
	templates/application.html

Loading branch information

yawboakye committed May 30, 2014

2 parents 1c3c9c8 + 6394adb commit 4a797dc