Hahahhaa.
Merge branch 'master' of github.com:EvanTedesco/QLhackfast
resolved merge conflicts