Add user_jack
Merge remote-tracking branch 'origin/master' into external_website
Merge remote-tracking branch 'origin/master' into external_website

Conflicts:
	database/DefaultData/EmployeeUserData.sql
Merge remote-tracking branch 'origin/master' into external_website
Merge remote-tracking branch 'origin/master' into external_website
Merge remote-tracking branch 'origin/master' into external_website
Merge remote-tracking branch 'origin/master' into external_website
Public site front end
Merge pull request #39 from AlecErasmus/external_website

External website