Add summer stuff and stuff from last spring.
Merge branch 'master' of github.com:Efreak/School-Work