new setup
Merge branch 'master' of https://github.com/maplethorpej/vibrant

Merging old files