Adding activity_two, and associated files
Merge remote-tracking branch 'origin/master'

Conflicts:
	Handin02/Handin02_grp11662/app/src/main/AndroidManifest.xml
Adding activity_two, and associated files