changed template file endings
changed module loading
Merge branch 'master' of github.com:WebBlow/amazine

Conflicts:
	scripts/views/feed.coffee