second commit made by Arun
Merge branch 'master' of https://github.com/DCUdacity/RocketSimulator

Conflicts:
	html/index.html
moving main.html to the html folder