Renamed servlet for story 7
Merge branch 'master' of https://github.com/Declan-Murphy/Group6.git
Merge branch 'master' of https://github.com/Declan-Murphy/Group6.git
Merge branch 'master' of https://github.com/Declan-Murphy/Group6.git
Renamed Failure to LoginFailure
set loginfailure to path /fail

fixed page for story 7. why was it broken?

fixed user creation fail page

added default dates and times for story 7 page
Merge branch 'master' of https://github.com/Declan-Murphy/Group6.git

Conflicts:
	Copy of org.dt340a.group6.sprint1/WebContent/WEB-INF/src/Failure.java
	Copy of org.dt340a.group6.sprint1/WebContent/story7.html
Merge branch 'master' of https://github.com/Declan-Murphy/Group6

Conflicts:
	Copy of org.dt340a.group6.sprint1/WebContent/WEB-INF/src/Register.java