Dummy commit
swapped out new brackets.png
Organized images into subfolders
Merge branch 'master' into year3-art

Conflicts:
	app/static/images/brackets.png
Removed subfolders from images

Organizing images into subfolders ultimate caused problems, so I
removed the folder organization.
Uploaded updated button art for town and world
Merge branch 'year3-art'
Rename button images