saving some things
Merge branch 'master' of https://github.com/FourSwordKirby/Trafficking-GCS-Fall-2014

Conflicts:
	Traffic-King!!/bin/TrafficKing.swf
Merge branch 'master' of https://github.com/FourSwordKirby/Trafficking-GCS-Fall-2014
transition state started
Merge branch 'master' of https://github.com/FourSwordKirby/Trafficking-GCS-Fall-2014

Conflicts:
	Traffic-King!!/bin/TrafficKing.swf
	Traffic-King!!/obj/Traffic-King!!Config.old
	Traffic-King!!/obj/Traffic-King!!Config.xml