added textarea, instructions
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/css/app.css
	assets/img/logo.png
	gfysound/.ropeproject/globalnames
	gfysound/.ropeproject/objectdb
	gfysound/settings/base.py
	gfysound/settings/production.py
	gfysound/urls.py
	gfysound/views.py
	gtool/__init__.pyc
	gtool/models.pyc
	static/css/app.css
	static/img/logo3.png
	templates/404.html
	templates/500.html
	templates/main3.html