styles updated
Merge branch 'master' of github.com:JumpStartGeorgia/PhotoHistory

Conflicts:
	app/assets/stylesheets/root.css.less