Merge branch 'de' of https://github.com/jacob-hegna/Shauna-game into de
It now compiles on windows, somehow
I think I added one line or something, but Jacob told me to commit anyways...
	modified:   src/media/json.cpp
Merge branch 'de' of https://github.com/jacob-hegna/Shauna-game into de
JSON parser operational. I used a bunch of assert statements to make sure it didn't crash, so at some point we'll either have to #define NDEBUG or manually remove them
	new file:   media/vocab.json
	modified:   src/media/json.cpp
	modified:   src/media/json.h
	modified:   src/states/gameplay/gameplay.cpp
	modified:   src/states/gameplay/gameplay.h
I added a whole bunch of vocab words
	modified:   media/vocab.json
Edited JSON stuffs to account for a change in design. Nothing too cray cray here
	modified:   media/vocab.json
	modified:   src/media/json.cpp
	modified:   src/media/json.h
Added a getVocab function to DefinData class
I got busy. I made some changes you might like :P
	modified:   media/tall.png
	modified:   src/actor/actor.cpp
	modified:   src/actor/actor.h
	modified:   src/media/json.cpp
	modified:   src/media/json.h
	modified:   src/states/gameplay/gameplay.cpp
	modified:   src/states/gameplay/gameplay.h
Added a rough question/anser shell, still needs to be fixed and paired with the answer choices
Merge branch 'de' of https://github.com/jacob-hegna/Shauna-game into de

Conflicts:
	src/media/json.h

OK GIT MERGE IS HARD STUFF FORGIVE ME OZZIE RIP NETWORK GRAPH #YOLO
	modified:   build-windows/Shauna-Game.v11.suo
	modified:   src/media/json.h
Merge branch 'de' of https://github.com/jacob-hegna/Shauna-game into de

Conflicts:
	src/states/gameplay/gameplay.cpp
	src/states/gameplay/gameplay.h

I fixed everything. Mother of god.
	modified:   build-windows/Shauna-Game.v11.suo
	modified:   src/media/json.h
	modified:   src/states/gameplay/gameplay.cpp
	modified:   src/states/gameplay/gameplay.h
	modified:   src/states/loop.cpp
Merge branch 'master' of https://github.com/jacob-hegna/Shauna-game