mm
mm
Merge branch 'dev'

Conflicts:
	README.md
that very hackily fixes the curses frontend for now
Merge branch 'master' into dev
one bug down
hmm
 mmm