eddit
Merge branch 'master' of https://github.com/allirf/IF3038-2013

Conflicts:
	TubesProgin2/Dashboard.php