added some stuff
Merge conflict
Merge branch 'master' of https://github.com/redsn0w422/HackIllinois2014