trying to fix dev branch
Now cleaning up dev
yesMerge branch 'cleaner' into dev
screw this
Updating dev so it's aligned with master
updated .gitignore file
updated image sizes and changed css output to compressed
Merge branch 'dev'