Mo' Shit
Merge branch 'master' of https://github.com/SkaarFace/JacksonArch

Conflicts:
	app/views/home/index.html.slim