Update test
Merge branch 'master' of https://github.com/JakeKahana/ialwayswantedtobe

Conflicts:
	client/.DS_Store