fixed styling but bootstrap still sucks ass
merge conflicts again ffs
Merge branch 'master' of https://github.com/citizengit/burning-airlines