Version 0.1
Merge branch 'master' of https://github.com/proginJAM/IF3038-2013

Conflicts:
	proginJAM/public_html/Dashboard.css
	proginJAM/public_html/Dashboard.html
	proginJAM/public_html/Profile.html
Header fixed and a few modification.