Initial commit, have not done test cases as should not work before on testcases, you can check time also as I've already  started odesk tracked
Merge remote-tracking branch 'upstream/master'