Merge branch 'master' of github.com:Starlight-Design/midterm into nicks
Merge branch 'nicks'