Added lines? maybe....
NVM
Tang fucked up please ignore
This may not work....

Merge branch 'Tang'

Conflicts:
	project.cpp
	test.h
This is better..