Fifth test commit.
testfile
11/09/2014 6:04
random message TC test
easing needless test comments.
testing TC automated trigger for github
11/09/2014 7:55
CT logo button
Merge remote-tracking branch 'origin/master'
11/09/2014 8:34
11/09/2014 8:48
11/09/2014 08:48PM
11/09/2014 8:48
Merge branch 'Jaime' of https://github.com/jjackson852/ConnectaTechTest1 into James
11/09/2014 10:25
Artifact Testing Test
Merge branch 'James' of https://github.com/jjackson852/ConnectaTech into Adam

Conflicts:
	.idea/artifacts/ConnectaTech.xml
	src/com/parse/package1/ConnectaTechApp.java