first commit
first commit
Merge branch 'master' of https://github.com/nbravo/likeawhale

Conflicts:
	.gitignore