add data files
Merge branch 'master' of github.com:lindseydew/who-stole-my-beer
UI updates etc
add json files
Merge branch 'master' of github.com:lindseydew/who-stole-my-beer
Merge branch 'master' into add-json-data
Merge branch 'master' into android

Conflicts:
	.gitignore