more shit
Merge branch 'master' of https://github.com/justinport/ByramDesigner

Conflicts:
	public_html/config.js
	public_html/svg-editor.html