Deleting so I can sync

I dunno why it's not letting me uncommit this... so I'm just manually
commiting to uncommit lol ya know?
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore