Merge branch 'master' into staging
Merge branch 'staging' of github.com:LRDesign/TimePulse into staging
Updating Bibliotech
Updated bt
Update bt
Update BiblioTech
Update BiblioTech
Update BiblioTech
Update BiblioTech
Update BiblioTech
Update BiblioTech
Cleanup debugging
resolve Merge conflict in gemfile.lock