Can't remember :S
Merge branch 'master' of https://github.com/xistoso/AquaplantX

Conflicts:
	AquaplantX/src/com/example/aquaplantx/GetTime.java