;-)
Merge branch 'master' of https://github.com/Themandunord/Training-Day-2013
Merge branch 'master' of https://github.com/Themandunord/Training-Day-2013

Conflicts:
	index.php