No Major Changes
Conflicts:

.DS_Store
imageupload/.DS_Store
imageupload/app/.DS_Store
imageupload/app/assets/images/.DS_Store
imageupload/app/assets/stylesheets/application.css
imageupload/app/views/home/index.html.erb
imageupload/app/views/users/show.html.erb
Derrppp
Merge branch 'master' of https://github.com/WilsonAus/Part2

Conflicts:
	.DS_Store
	imageupload/app/assets/stylesheets/application.css
	imageupload/app/views/home/index.html.erb
	imageupload/app/views/users/show.html.erb