From Cloud9
Merge branch 'master' of github.com:CoolCoolCoolCool/Cloud9Test

Trying to pull, no clue what I'm doing.