bam
Merge branch 'master' of https://github.com/alsocollective/revolucian-perpetua
fixed conflicts
fixed conflicts
completed styles ands fixes