merged
Merge branch 'master' of
https://github.com/tf3193/Software-Design-team.git

Conflicts:
	.classpath
fixed merge conflicts
Merge branch 'master' of https://github.com/tf3193/Software-Design-team.git
Made buttons pretty, new icon, new name and few other UI changes
New icon, new buttons, new name and a few other changes
Merge branch 'master' of https://github.com/tf3193/Software-Design-team.git
inctruction button changes