some stuff i dont know
Merge branch 'master' of github.com:fzymek/Android-Developement

Conflicts:
	.gitignore