Random
Merge branch 'master' of https://github.com/RizkiHXC/FED2

Conflicts:
	Rizki Skeleton/js/app.js