v1.1

Made it worked.
v1.2

weeee
another test

added line
awwww sad
Cleant up
another test

added line
awwww sad
Cleant up
trying to sync
Merge branch 'develop' of https://github.com/tledford/438 into develop

Conflicts:
	src/testing.java