Continued working on stuff

render almost complete
Merge branch 'master' of github.com:Toukmond/txt

Conflicts:
	index.html
	script.js

Fixed differences in git repos