Init
Merge branch 'master' of github.com:klkeusch/First_App

Conflicts:
	.gitignore