Merge branch 'master' of https://github.com/Involve-Seattle/Activity-Calendar into dev
clean up
merge
Added styles through sass. Bassic masthead works. Updated gruntfile. Added menu icon.
better data scraping, event views
Merge pull request #14 from Involve-Seattle/apilogic

Apilogic
templates/dev merge
Merge branch 'templates' into dev
bug fix
Merge pull request #16 from Involve-Seattle/jsuserroutes

bug fix
Added Favicon files and adjusted html to link to them.
Got Nav drop down working. Still want it styled better. But it works.
small changes to header
Merge branch 'dev' of https://github.com/Involve-Seattle/Activity-Calendar into sass
merge
merge
Merge branch 'templates' into dev
Moved favicon down one folder. Continuing to edit drop down nav on site header.
merge templates
Merged from dev.