more things
Merge branch 'master' of github.com:mattlaten/gt-1
MORE STUFFFF
Foxed merge conflicty
lol
merge conflict please check result