added bunch of stuff
merge
Merge branch 'master' of github.com:vivekseth/TimeWiseServer