minor shit
Merge branch 'master' of https://github.com/chrishoage/bump

Conflicts:
	js/states/setup_state.js