changes, again, trying to get rails to work
Merge branch 'master' of https://github.com/bobbysmith/JOTD

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.erb
css changes
got entire front end to work, needs database to be fully functional