old changes bstuck
old changes bstuck
Merge branch 'master' of github.com:johanjoensson/TSBK03-Project

Conflicts:
	src/main.cpp
	src/simple.geom
Progress!!
Nus�