changes, additions
Merge branch 'master' of https://github.com/huyle333/hackreduce2013