set up variables
Merge branch 'dev' of https://github.com/newset/songs into dev

Conflicts:
	file.php