add gitignore
Merge branch 'master' of github.com:aragornAGH/huffingtonED
my changes
Merge branch 'master' of github.com:aragornAGH/huffingtonED
Merge branch 'master' into my_commit

Conflicts:
	src/main/java/pl/edu/agh/ed/dao/AuthorManipulate.java
	src/main/java/pl/edu/agh/ed/dao/CommentManipulate.java
	src/main/java/pl/edu/agh/ed/dao/ManipulateData.java
	src/main/java/pl/edu/agh/ed/dao/TopicManipulate.java
Merge branch 'my_commit'