commit to merge
fixed merge issues
detective notes appears when clicked on and brings up a text field
added three combo boxes with correct options
Room names now show correctly