init
Init
Merge branch 'master' of https://github.com/shanika/flatmate
init
Conflicts:
	.gitignore