templating
Merge branch 'marybranch'

Conflicts:
	index.js
	package.json
	views/index.hjs
Merge branch 'master' of github.com:AfterNextCom/if-stats into newb
Merge branch 'master' of github.com:AfterNextCom/if-stats
Merge branch 'newb'