Merge branch 'Cleanup'
scroll bar is now on right
Merge branch 'master' of https://github.com/noahpc/WhiteCollar