curses\!
hmm
HMM
Merge branch 'dev' of https://github.com/koo5/new_shit into dev
more hacking on main_curses
Merge branch 'master' into dev
stuff
mmm
mmm
Merge branch 'dev' of http://37.46.80.80/grem_lemon/ into dev

Conflicts:
	stuff/the_doc.py
mmm
finally moving the doc from google docs here. Also, sdl gui is mostly fixed, just menu doesnt react to keypresses
lesh
hmm i will finish this later
dont crash it
Merge branch 'dev'

Conflicts:
	README.md