Resource routes and development log
Merge branch 'master' of github.com:michaelsedits/project-rails

Conflicts:
	config/routes.rb
	log/development.log