initial commit
Merge branch 'develop' of github.com:wisesmile/2014-10-22 into develop