sidebar button
stats
Merge branch 'master' of https://github.com/nmhall/FrontEndDevelopmentProject

Conflicts:
	mockRoomData.js