Merge pull request #1 from TechnoTitans/master

Pull
random
Merge branch 'master' of
https://github.com/TechnoTitans/CodeClash-2014.git

Conflicts:
	CodeClash-2014/src/testing/HelloGIT.java