Working on movement- commit to allow pull
Merge origin/master

Conflicts:
	SpaceTrader/nbproject/project.properties
Finished testing and implementing player movement

Merge origin/master

Conflicts:
	SpaceTrader/nbproject/project.properties
Merge origin/master