modified view stuff, added button to determine if something is in the view or not
Merge branch 'master' of https://github.com/nrmilstein/cs4750-project