javascript work
Merge branch 'master' of https://github.com/sdenton4/pipic

Conflicts:
	djpilapse/djpilapp/models.py~
	djpilapse/djpilapp/urls.py~
	djpilapse/djpilapp/views.py~
	djpilapse/djpilapse/urls.py~
	djpilapse/templates/index.html~
Merge branch 'master' of https://github.com/sdenton4/pipic