first commit
Merge branch 'master' of github.com:Interactive-systems/project
Basic structure for the application with a map showing your location working.
Merge branch 'develop'