remove collage.jpg
new UniCoffeShoop
Merge branch 'master' of https://github.com/edisdead/spl141

Conflicts:
	assignments/ass2/src/Main.cpp
	assignments/ass2/src/UniCoffeeShop2.cpp