I want a commit too (ღ˘⌣˘ღ)
	modified:   src/states/gameplay/gameplay.cpp
Merge branch 'master' of https://github.com/jacob-hegna/Shauna-game
Merge branch 'de' of https://github.com/jacob-hegna/Shauna-game
Merge branch 'de' of https://github.com/jacob-hegna/Shauna-game
I added a json class (kinda) and changed jumping mehanics slightly
	modified:   src/actor/actor.h
	modified:   src/states/gameplay/gameplay.cpp
	src/media/json.cpp
	src/media/json.h
	src/media/rapidjson/
I forgot to add the new files...
	new file:   src/media/json.cpp
	new file:   src/media/json.h
	new file:   src/media/rapidjson/document.h
	new file:   src/media/rapidjson/filestream.h
	new file:   src/media/rapidjson/internal/pow10.h
	new file:   src/media/rapidjson/internal/stack.h
	new file:   src/media/rapidjson/internal/strfunc.h
	new file:   src/media/rapidjson/prettywriter.h
	new file:   src/media/rapidjson/rapidjson.h
	new file:   src/media/rapidjson/reader.h
	new file:   src/media/rapidjson/stringbuffer.h
	new file:   src/media/rapidjson/writer.h
Merge branch 'master' of https://github.com/jacob-hegna/Shauna-game
Merge branch 'de' of https://github.com/jacob-hegna/Shauna-game into de