once upon a time, changes come
clean up
core & app now live apart
counter demo
counter demo
default template fix
Merge branch 'master' into new_app

Conflicts:
	.gitignore
up to date with master
description fix
description fix 2
session store temp fix
mer
author example
merged
Merge branch 'master' of https://github.com/bsu-web/conference