Deleting files and moving them one folder up
Adding CHI 2014 paper
Merge branch 'master' of https://github.com/hcilab-um/STim