flag work
merging conflicts
Added flags
Task Flags
Merge branch 'Web' of https://github.com/RHITJuniorProjects/JrProj-1415-Mike into Web

Conflicts:
	Code/Web/public/henry.js