Akash/Chris - added some db fun
Merge branch 'master' of https://github.com/akash/rubyfridays

Conflicts:
	config/routes.rb