Merge pull request #1 from yasho/master

Merging Yasemin's changes
working on registering clicks, but other changes completed
removed unnecessary file
click enforcement works I think, still need to extensively test
Merge pull request #1 from michelleoj/master

get michelle's changes