repo created
gitignore changed
Merge branch 'master' of https://github.com/juanmacuevas/wtf-app

Conflicts:
	.gitignore