Git config
Merge remote-tracking branch 'origin/master'

Conflicts:
	SimpleListProject/.idea/vcs.xml
	SimpleListProject/.idea/workspace.xml
Need to locate the Icon Resource