Merge pull request #9 from RyanRiffle/Dev

Dev
fixed #10
.
fixes #11
Merge branch 'master' into Dev

Conflicts:
	app.html
	css/app.css
	js/textcursor.js
	js/writer.js