MERGE CONFLICT!
Merge branch 'develop' of https://github.com/soledaddiez/gitTrial into feature/LewisFeature02Conflict

Conflicts:
	Trial/src/com/Trial.java