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
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