styling
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint into development
took out bug that causes markers to not work.
Merge pull request #39 from jtrope89/master

Markers were fucked up before, now they should work.