more stuff
Merge branch 'master' of https://github.com/djuta/notre-dame
slug now auto generates
Merge branch 'master' of https://github.com/djuta/notre-dame

Conflicts:
	Admin/Admin.master