first commit
Merge https://github.com/mfountoulakis/first-app

Conflicts:
	.gitignore
first commit