Merge conflict?
Merge branch 'master' of https://github.com/AustinSlominski/Mumble

Switching computers. Let's not have this get out of hand.
Merge branch 'master' of https://github.com/AustinSlominski/Mumble

Once again, whyyy is this a merge conflict?