change in.ftl
Merge branch 'master' of https://github.com/ReturnOnIntellingenceTraineeCommunity/rtc-app

Conflicts:
	src/main/java/com/springapp/mvc/HelloController.java
	src/main/webapp/WEB-INF/pages/in.ftl
	src/main/webapp/WEB-INF/web.xml
change in.ftl