many updates. Finished for the tomorrow demo
Merge branch 'master' of https://github.com/frewsxcv/collegespark