COMMITTTT
Merge branch 'master' of https://github.com/siddhantpuri/bridgethegap

Conflicts:
	log/development.log
	tmp/pids/server.pid