Don't want userData.json in commits.
Merge branch 'master' of https://github.com/sainsley/artbark

Conflicts:
	src/userData.json