Adding fix to manifest to allow us to build
main compose fragment outlined with partial layout
list fragment working
modified compose main; working on compose time
changes to FragmentComposeTime
compose time working, needs rounding and bounds checking; compose main holds values even while switching to compose time
not much, just so I can pull
testing agian
Merge branch 'compose_branch' of https://github.com/scobb/Impromptu into compose_branch

Conflicts:
	.idea/misc.xml
Modified FragmentComposeTime.java to output times in correct standard time.
Merge branch 'compose_branch' of https://github.com/scobb/Impromptu into compose_branch

Conflicts:
	.idea/misc.xml
adding .idea/misc.xml so that I can pull
Merge branch 'compose_branch' of https://github.com/scobb/Impromptu into compose_branch

Conflicts:
	.idea/misc.xml
in the process of adding compose push and stream
fixing ./idea/misc.xml from merge issues
Merged manifest
merge
Merge branch 'master' into dev_scobb
fragment stream round 2
try three