Changed header and footer file extensions and updated TODO
Changed header and footer file extensions and updated TODO
Merge branch 'master' of github.com:ryanlangley4/Solar-Empire

Conflicts:
	TODO