HTML Formatting, cleaned up some old files
Tweak git ignore
Added gitignore
Merged new changes