Um. well, adding the things doesnt work with the other things but it sort of looks pretty mabye
Merge branch 'master' of https://github.com/mike-n-7/PressPlay

Conflicts:
	PressPlay/data.db