using resource to build routes for now
Merge branch 'master' of https://github.com/jaredplanter/chalupa_batman

Conflicts:
	config/routes.rb