closes #7
closes #7
Merge branch 'master' of https://github.com/migheille/knoozroom

Conflicts:
	.htaccess