Update ignore
Merge branch 'master' of https://github.com/NotEvenEntertaining/Museapp

Conflicts:
	.gitignore
Test