adds building and room filtering
Merge branch 'work' of github.com:Team-15/TimetablingSystem into work