Added features...
Merge branch 'master' of github.com:Chaos89/CodeDay