Work up to date - still not working, need to pull it apart. Might ditch NappDrawer and roll my own.
Merge branch 'master' of https://github.com/AndySw/CodeComp

Conflicts:
	app/views/index.xml