Penyelesaian
Merge branch 'master' of https://github.com/Sundragoon/IF3038-2013

Conflicts:
	Dashboard.js
	home.html
	style.css
Penyelesaian 2