get Grunt working
.gitignore now working?
corrected .gitignore
Merge branch 'alex'
small changes made to footer
Merge branch 'alex'