Got basic stuff working.
Fixed more stuff.
Merge branch 'master' of https://github.com/maxdumas/niarret

Conflicts:
	js/main.js