Restoring .gitignore
HTML render now working
Resolving stash1 conflict