wtf why does it insist on giving back the parent??
Merge branch 'master' of github.com:patrickhulce/codiphy

Conflicts:
	app.py
Merge branch 'master' of github.com:patrickhulce/codiphy
ui changes