Updated web.js
Fix for web.js
Fix for web.js
Fix
Merge branch 'master' of heroku.com:hidden-brushlands-8841

Conflicts:
	web.js
Added marketing site template

This commit also adds a .gitignore