latest from mine
Merge branch 'master' of https://github.com/godiane/fitsenv

Conflicts:
	.virtualenvs/django15/lib/python2.7/site-packages/upload/forms.py
	.virtualenvs/django15/lib/python2.7/site-packages/upload/forms.pyc
	.virtualenvs/django15/lib/python2.7/site-packages/upload/models.pyc
	.virtualenvs/django15/lib/python2.7/site-packages/upload/urls.pyc
	.virtualenvs/django15/lib/python2.7/site-packages/upload/views.pyc
added youtube embed - need to debug