not good
Merge branch 'master' of https://github.com/liangvic/ChunkyMonkeys into travis
Added info for test1
Fixed travis merge conflicts