get Grunt working
.gitignore now working?
corrected .gitignore
corrected .gitignore
Merge branch 'alex'
fixed .gitignore merge
small changes made to footer
Merge branch 'alex'
Merge branch 'master' into heroku