Removed intelliJ project from repository

Signed-off-by: Nicholas Jackson <nic@thatlondon.com>
Merge branch 'master' of https://github.com/nicholasjackson/PebbleBike-AndroidApp

Signed-off-by: Nicholas Jackson <nic@thatlondon.com>

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml
	src/com/njackson/MapFragment.java