pushing some basic stuff
Merge branch 'master' of https://github.com/jcburke14/dugong

Conflicts:
	config/routes.rb