some updates from the main computer
Merge branch 'master' of http://github.com/alsocollective/revolucian-perpetua