merging
Merge branch 'master' of github.com:kolemannix/markov-madness

Conflicts:
	markov-clj/src/markov_clj/twitter.clj
Add mock user function