git has one again by making me create yet another commit
Merge branch 'master' of github.com:wibbelsmac/otolith_senior
what a bunch of crap
Merge branch 'master' of github.com:wibbelsmac/otolith_senior