fixed time event
Merge branch 'master' into deployment
meh
added karma method
Merge pull request #26 from ieatkimchi/adding_karma_method

Adding karma method
fixed merge conflicts