Small edits
Merge branch 'master' of https://github.com/alecajuice/Hivolts.git
Merge branch 'master' of https://github.com/alecajuice/Hivolts.git