css shit
Merge branch 'master' of https://github.com/TheRockman/JApp
merge