View Workout and Calendar stuff work now
Merge pull request #37 from jwisch91/master

Brian and I get shit done
Added files
GPS fixes, change names in Settings
Merge pull request #38 from jwisch91/master

GPS Fix.
Added pages for yes and no on View Workout. Also fixed About us page.
Fixed Conflicts
Added files