Merge branch 'NewBranchJorian' of https://github.com/theysconator/tripping-dubstep into Test

Conflicts:
	test.txt
Reversing the 3 latest commits (TEST)
Merge branch 'master' of https://github.com/theysconator/tripping-dubstep
Merge branch 'Test' of https://github.com/theysconator/tripping-dubstep

Conflicts:
	test.txt