edited draw and index
"fixed conflicts"

Merge branch 'master' of https://github.com/phrayezzen/hacktx2013

Conflicts:
	src/index.html