lol
Merge branch 'master' of https://github.com/TheRockman/JApp

Conflicts:
	assets/css/style.css