Minor changes to fix some bugs from last merge
Fixing gitignore and adding some static files