hi
Merge pull request #5 from agilecodecamp/20140902

Merge to master