..
Merge branch 'master' of https://github.com/WilsonAus/Part2

Conflicts:
	imageupload/app/assets/stylesheets/application.css