updating with master for deployment
updating and merge conflict
Merge pull request #13 from fab9/master

Add .gitignore
product page
Merge branch 'development' of https://github.com/LoganArnett/crosstrackapp into development
updating from origin
Ds
ds
ds
adding product page
removed product
new feature to Add a workout
undo this commit
new workout movements object and controller
fab9: fetch Logan's feature/new-workout
fab9: add .gitignore
fab9: wipe out everything except .git
fab9: newly generated Yeoman project
fab9: move css in index.html to index.scss
fab9: index.html -> main.html, navbar.html
fab9: rename main -> controllers, create views dir