okay/cancel in location
Merge branch 'compose_branch' of https://github.com/scobb/Impromptu into compose_branch

Conflicts:
	app/src/main/java/com/example/steve/impromptu/Main/ActivityMain.java