Designing
Merge branch 'master' of https://github.com/jartek/airbnbclone

Conflicts:
	log/development.log