Added header guards.
Merge branch 'Tom'

Conflicts:
	User.h