Updated
Updated

This reverts commit 4ef7a0693b98410a18cdf1308e67de689559a7f7.
Merge
Merge branch 'master' of https://github.com/Digt/TrustedNet

Conflicts:
	.gitignore