test_inventory
t_experience needed to be committed for some reason...?
Merge remote-tracking branch 'origin/master'

Conflicts:
	desktop/test/rouje_like/t_experience.clj