Added gitignore
Lots of changes
Merge branch 'master' into updates

Conflicts:
	default.hbs
	index.hbs