commit mod
user input
merge
fixing tylers mistake
Merge and shit
evaluratr.iml & local.properties
Merge pull request #1 from UCF-HackFSU/search

merge master and search