new start
Merge branch 'master' of https://github.com/rileyamos/Terran-App

Conflicts:
	Resources/HTML/index.html
Merge branch 'master' of https://github.com/rileyamos/Terran-App