Local commit
Saving work to switch branches
Merge branch 'master' of https://github.com/bfox1/SAO
Changed layout a bit.
Merge branch 'master' of https://github.com/bfox1/SAO