Merge branch 'master' of github.com:RKJuve/class-barometer into patrick
for real this time, fixed the undefined issue in the teacher join classroom click event
Merge branch 'master' of github.com:RKJuve/class-barometer into patrick
Merge pull request #25 from RKJuve/patrick

MERGING!
Merge branch 'master' of github.com:RKJuve/class-barometer into styling

Conflicts:
	js/main.js