First commit on lola branch
git ignore
try and err
2nd try
Shachar change
Merge branch '1.0.0' of https://github.com/gittest12/demo into 1.0.0

Conflicts:
	demo/src/main/java/demo/Application.java
test xxx
hdfhgf
Merge branch '1.0.0' of https://github.com/gittest12/demo into 1.0.0

Conflicts:
	demo/src/main/java/demo/Application.java
try try
jhgjkg
Merge branch '1.0.0' of https://github.com/gittest12/demo into 1.0.0

Conflicts:
	demo/src/main/java/demo/Application.java
jkljklj
Adding hibernate to pom
Adding postgres dependency to pom
# WARNING: head commit changed in the meantime

Merge branch '1.0.0' of https://github.com/gittest12/demo into 1.0.0

Conflicts:
	demo/src/main/java/demo/Application.java
Merge branch '1.0.0' of https://github.com/gittest12/demo into 1.0.0
Add git .ignore file
Merge branch '1.0.0' into develop

Conflicts:
	demo/.gitignore
	demo/src/main/java/demo/Application.java