TIME IS FIXED
Merge branch 'master' of https://github.com/scobb/Impromptu into branch_compose_time

time is fixed yayayay
fixed cancel button on compose type, got profile to show on stream
merging new profile and compose type
Merge branch 'master' of https://github.com/scobb/Impromptu into branch_compose_time
praying I don't fuck everything up

Merge branch 'branch_compose_time'

Conflicts:
	app/src/main/java/com/example/steve/impromptu/Main/Compose/FragmentComposeTime.java
	app/src/main/java/com/example/steve/impromptu/Main/Profile/FragmentProfile.java
	app/src/main/res/layout/fragment_profile.xml
I hate everything
Merge branch 'master' of https://github.com/scobb/Impromptu