more stuff
asd
Merge branch 'master' of https://github.com/BergarSimonsen/BNDN-Project

Conflicts:
	RestService/RestService/DatabaseConnector.cs
	RestService/RestService/RestServiceImpl.svc.cs
	RestService/RestService/bin/RestService.dll
	RestService/RestService/bin/RestService.pdb
Fixed minor conflicts
Update gitignore + removed bin