hello
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
added files, staging deployment didnt work
cleaned up js and added controller to app.js
trying to get font to work in build
before changing bootstrap.css
about to bower install font awesome
updating to bootstrap 3
committing
trying to build