Added user functionality, changed a lot of the API.
Merge branch 'master' of https://github.com/kryzodoze/340-project

Conflicts:
	UpliftProject/BusinessLayer.cpp
	UpliftProject/BusinessLayer.h