Ooops. Forgot to change some names
Merge branch 'master' of github.com:vvaidy/skeleton