Merge branch 'master' of https://github.com/Avslor/JourneyThroughAvslor into candidate

Conflicts:
	.travis.yml

	modified:   .travis.yml
Merge branch 'master' of https://github.com/carharttjimmy/JourneyThroughAvslor into candidate
yo
Conflicts:
	.travis.yml
Update .travis.yml
fixed
Merge branch 'candidate' of https://github.com/carharttjimmy/JourneyThroughAvslor into candidate
Merge pull request #23 from carharttjimmy/candidate

Addition of thread and components for the engine
updated readme.md :P
Merge branch 'master' into candidate

Conflicts:
	.travis.yml
	src/main/java/JourneyThroughAvslor/Main.java
fixed main.java
fixed readme so I can do a pull request on Avslor
Merge branch 'master' of https://github.com/Avslor/JourneyThroughAvslor into Avslor-master

Conflicts:
	README.md
	modified:   src/main/java/JourneyThroughAvslor/Engine/Shared/MapReader.java
Removed JSON to switch to gradle handling JSON.
Removed JSON source, will let grandle handle it
Merge branch 'candidate' of github.com:carharttjimmy/JourneyThroughAvslor into candidate
fix build
d
Merge branch 'candidate'

Conflicts:
	src/main/java/org/json/Cookie.java
	src/main/java/org/json/CookieList.java
	src/main/java/org/json/HTTP.java
	src/main/java/org/json/JSONStringer.java
	src/main/java/org/json/JSONWriter.java
fixed mapreader
fixed mapreader