added workout.html, workoutController.js
Merge branch 'workout' of github.com:Fit-Genie/fit-genie-site into workout
Merge branch 'master' of github.com:Fit-Genie/fit-genie-site into workout
added css file to index.html
Merge branch 'workout' of github.com:Fit-Genie/fit-genie-site into workout
adding workout files
adding workout controller and directive"
mergin
resolving merge conficts