fix .gitignor file
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
sqlite3 to test and pg gem
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta

Conflicts:
	log/development.log
add rails12 factor
add rails 12 factor
edit javascript on layout page
reload javascript replaced
precompile js
change category id
add ruby version
take out js compressor uglifier
added question controller logic to handle rendering error
change category to category id integer
include whole category object
change start_language and end_language from integer string to names
fix postgres, answers saving and formatted correctly
render login page from controller
add haml rails to gemfile
add haml-rails