fixed some issues with bower_components location
Merge branch 'master' of https://github.com/Fittr/fittr
modified index.htmll to match the new file structure
Merge branch 'master' of https://github.com/Fittr/fittr
to fix merge conflicts
to fix issues with index.html not finding the bower_components dir
Merge pull request #2 from stateoflux/master

to fix issues with index.html not finding the bower_components dir