Updates
Merge branch 'development' of https://github.com/JLPhillips/BandUp into development