Added timing
Merge branch 'master' of https://github.com/AndrewBelt/hobo-rpg

Conflicts:
	src/actions.coffee