final commit
final changes
Merge branch 'ganesh_latestIntegrated' of https://github.com/mallikakulkarni/CMPE273ProjectGroup3 into ganesh_latestIntegrated

Conflicts:
	cmpe273_project_thymeleaf/pom.xml
	cmpe273_project_thymeleaf/src/main/java/stickynote/CreateNote.java