upload
Merge branch 'master' of https://github.com/College-Living/College-Living.git
errthang. image scaling, menu buttons, etc.