added room number and building support
Merge branch 'john_iter4' of github.com:johngun3/Project_Steak into wes_iter_4_filter
filter working