Committing to merge
Merge branch 'master' of https://github.com/afabbro/interdisciplinary-programming
Fix form CSS jank, flip my shit over inconsistent naming conventions jeez
Fix merge conflict