COMPILES!! Files now match new template files in /public.

- edited .gitignore to exclude unnecessary files
Merge branches 'master' and 'new'