Sync from laptop to github
Merge branch 'master' of https://github.com/themyth92/FYP

Conflicts:
	Project/bin-debug/GameDev.swf
Added dialog bubble implementation. Haven't completed yet. Still need to improve the event handler