day 16
day
day 16
rebase
Merge branch 'master' of https://github.com/njjnex/2go.git

Conflicts:
	myProject/src/main/webapp/WEB-INF/pages/main.jsp
	myProject/src/main/webapp/WEB-INF/resources/css/menu.css