eaasfdgfhg
Merge branch 'master' of
https://github.com/Stannisthemanis/SD_project2.git

Conflicts:
	WebContent/CurrentMeetings.jsp
	src/struts.xml