commit before merge
Merge branch 'master' of github.com:dcarrot2/sharkpulse_android

Conflicts:
	sharkpulse_android.iml
Cleaned form activity and start activity
Merge branch 'master' of github.com:dcarrot2/sharkpulse_android
Receive coordinates from map in formactivity
Commit before merge
Merge branch 'master' of github.com:briandeanda/sharkpulse_android
Fix coordinates bug
Conflicts:
	SharkPulse.iml