Initial commit
initial commit
added git ignore file
Merge github.com:stefantrost/AndroidLocationApp
Merge github.com:CodingNight/AndroidLocationApp

Conflicts:
	README.md