-
Merge branch 'master' of https://github.com/TheBylders/directory

Conflicts:
	db/development.sqlite3
Basic frontend