a more recent commit because we've been kind of slow on github lately
Merge branch 'gh-pages' of https://github.com/opensourceginger/podbeat into gh-pages

Conflicts:
	README.md
	about.php
	artistdashboard.php
	artistinfo.php
	artistlogin.php
	artistregister.php
	creators.php
	error_log
	index.html
	index.php
	login.php
	register.php
	search.php
	upload.php
	userdashboard.php