added more icons and put them in main activity
Merge pull request #153 from jivedesign/master

added more icons and put them in main activity
Merge branch 'master' into dev

Conflicts:
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/MainActivity.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$drawable.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$id.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$layout.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$menu.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$string.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$style.class
	cmput301t03app/gen/ca/ualberta/cs/cmput301t03app/R.java

adgadgadgadga