Spring 2015 time and room
Merge branch 'master' of github.com:kwurst/CS-401