Apparently I'm supposed to be ashamed of myself.

:bug: :icecream: :cry:
Merge remote-tracking branch 'origin/master'

Conflicts:
	MinecraftProfilePro.iml
GH's being derpy.