better parse
Merge branch 'master' of https://github.com/godgunman/bumbler_to_count

Conflicts:
	js/app.js