finishing
Merge branch 'master' of https://github.com/fmuhtadin/IF3038-2013

Conflicts:
	src/dashboard.css