Fix git conflict with README file (wtf)

This commit is contained in:
Skylar Ittner 2018-04-12 01:46:23 -06:00
commit 64563e0b8f