somestyling
Merge branch 'master' into styling
stuff that looks nicer
Merge pull request #18 from neapolitan-a-la-code/styling

Styling
tidied up s1nat
mergehell