Some more adjustments done
Merge branch 'pr/1' of https://github.com/RizkiHXC/FED2 into pr/1

Conflicts:
	Rizki Skeleton/js/app.js