iMac Working Copy

Signed-off-by: Bryan Dixon <javawolfpack@gmail.com>
Merge branch 'master' of github.com:javawolfpack/CSCI567---Workspace

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/RelativeLayoutExample/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.jsp.core.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1622240037.index
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	ButtonExample/AndroidManifest.xml

Signed-off-by: Bryan Dixon <javawolfpack@gmail.com>