Added square function
Merge branch 'development' of github.com:LukeHackett/git-test into development

Conflicts:
	MyMath.java