THAT IS STUPID
GO
Merge branch 'master' of https://github.com/SuperShit5/TraderTest.git

Conflicts:
	src/com/SuperShit5/tradertest/MainActivity.java