going to have to change this to json
trying to change middle
Merge branch 'master' of github.com:turb0charged/CS490
made it nice
middle stuff
Merge branch 'master' of github.com:turb0charged/CS490