Fixed rounding error on times.
Merge branch 'compose_branch' of https://github.com/scobb/Impromptu into compose_branch

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

getting everyone else's files?
basic functionality for compose push
okay/cancel in location
Updating time logic
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
Merge
Merge branch 'compose_branch' of https://github.com/scobb/Impromptu into compose_branch
Merge2