media
Merge branch 'master' of https://github.com/senonchen/popcans

Conflicts:
	media/js/creationcollection.js
	media/js/signup.js
	templates/accounts/signup.html
	templates/blog/blog_create.html