Added Util class
Merge branch 'master' of https://github.com/momenso/codechallenge
Refactoring & Cleanup