Styling changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/uq/deco7381/runspyrun/activity/AttackActivity.java