Added code for ivy
Added shader that wraps around a cylinder.
Small commit to be able to merge
Merge branch 'master' of https://github.com/bisen/cs123FinalProject

Conflicts:
	Makefile
	final
	final.pro.user
	mainwindow.o
	moc_view.cpp
	ui_mainwindow.h
	view.cpp
	view.o