No changes.
Merge branch 'development'
Create README.md

Added README
Update README.md
Added icon and buttons
added pause, reset and continue feature
Changed layout
update
Added TimerFragment to replace TimerActivity.
Merge remote-tracking branch 'origin/development-timer'
Fixed the restart button on the TimerFragment.
Merge remote-tracking branch 'origin/development-timer'
created addworkoutactivity
new branch
new branch
Implemented TimerManager that reads in a workout from an array and creates TimerFragments accordingly.
Merge branch 'development-timer'

Conflicts:
	routime/src/main/java/me/jessicawu/routime/TimerActivity.java
Merge branch 'master' of github.com:wujessica/Routime
Move strings to values file.
update