syncing stuff
Merge branch 'master' of https://github.com/scott-swarthout/2048

Conflicts:
	.idea/workspace.xml