updated android manifest
fixed merge errors
Merge branch 'master' of https://github.com/asell/cis350
added fonts and background image
changes to workout summary
merge conflict resolution
more merge conflicts
added progress activity
bug fix in workoutSummary
added progress activity
progress activity added
fixed passing new workout to summary
fixed passing workout to summary
changed prev workout activity
merged with upstream
attempting to fix layout problems