nic
Merge branch 'master' of github.com:r3dr1f/Online-Radio

Conflicts:
	project/project/templates/default.mako