merge
Merge branch 'master' of https://github.com/jackygrahamez/john_g_shultz

Conflicts:
	.tmp/styles/main.css
	src/main/webapp/dist/index.html
	src/main/webapp/dist/views/main.html