Initial commit
Merge branch 'master' of github.com:DjxDeaf/myfirstapp

Conflicts:
	.gitignore