More Changes
Merge branch 'master' of https://github.com/12sm/JosephAkins

Conflicts:
	assets/css/app.css