minor changes
Merge branch 'master' of github.com:peterxsu/MHacks-2013-DPS-Game

Conflicts:
	Display.cpp
	Display.h
added functionality for correct player movement