new file:   src/main/java/com/shubincorp/happstarmaven/Author.java
	new file:   src/main/java/com/shubincorp/happstarmaven/Comment.java
	new file:   src/main/webapp/WEB-INF/jsp/comments.jsp
	new file:   src/main/webapp/WEB-INF/jsp/utils/headerComments.jsp
	new file:   src/main/webapp/resources/css/commentsMenu.css
	new file:   src/main/webapp/resources/css/headerMenu_1.css
	new file:   src/main/webapp/resources/img/btn-add-comment.png
	new file:   src/main/webapp/resources/img/pic1.png
	new file:   src/main/webapp/resources/img/pic2.png
comments added
Merge remote-tracking branch 'origin/master'

Conflicts:
	target/happstarMaven-0.1/WEB-INF/jsp/createPoolFirst.jsp
	target/happstarMaven-0.1/WEB-INF/jsp/createPoolSecond.jsp
	target/happstarMaven-0.1/WEB-INF/jsp/utils/headerMenu.jsp
	target/happstarMaven-0.1/resources/css/.sass-cache/ed60bb3fceabf8a2792948495f9d2d8c54cee397/pools.scssc
	target/happstarMaven-0.1/resources/css/headerMenu.css
	target/happstarMaven-0.1/resources/css/pools.css
	target/happstarMaven-0.1/resources/css/pools.scss
	target/happstarMaven-0.1/resources/img/poolsVariant.png
	target/maven-archiver/pom.properties
lease enter the commit message for your changes. Lines starting

comment added