board and tile commits
Merge branch 'master' of https://github.com/TejasviBojja/Project203Version3

Conflicts:

	src/main/java/cmpe203/project/MyTacks/api/resources/LandingPageResource.java
	src/main/resources/LandingPage.ftl
commit