Initial commit
Merge branch 'master' of github.com:domekichi/my_app

Conflicts:
	.gitignore