Push!
Merge branch 'master' of https://github.com/bodhibroy/shipSimulation

Conflicts:
	FrontEnd/js/dvdFront.js