Test
Merge branch 'master' of https://github.com/shked0wn/GoatEditor

Conflicts:
	public/index.html
	web.js