Adding an index page and trying hand at SPI
Adding .gitignore file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/jsp/index.jsp