commit
Merge branch 'master' of https://github.com/TejasviBojja/Project203Version2

Conflicts:
	.classpath
	src/main/resources/CreateBoard.ftl