Merge branch 'master' of https://github.com/maltekosian/drafter

Conflicts:
	README.md
	dropbox1.html
	img/Screenshot game.png
	img/Screenshot note.png
	img/Screenshot script.png
	img/icon_goo96.png
	img/icon_logo128.png
	img/icon_logo24.png
	img/icon_logo36.png
	img/icon_logo48.png
	img/icon_logo64.png
	img/icon_logo72.png
	index.html