Merge branch 'master' of github.com:markcharyk/Haikute into gevent
roughcodeinHANDS
Integrate Dictionary and Haiku.py
Add proper ajax maybe
stuff
MOAR AJAX
roughed in wsgi app
Merge branch 'ajax-try-2' of github.com:markcharyk/Haikute into gevent
moving directories
nginx config
Figuring out JSON handling
included nginx config file
Merge branch 'ajax-try-2' of github.com:markcharyk/Haikute into gevent

Conflicts:
	static/haikute_page.html
working uri handling
static add
my hands are typing words
Merge branch 'master' into ajax-try-2
Working AJAX!
Move Haiku, Haikute_Dictionary, Paradigm_Phrases to Haikute folder
add haiku functionality