updated gitignore
fixed project.properties file
Merge branch 'master' of https://github.com/Akodiat/Ljudjagare
Merge branch 'master' of https://github.com/Akodiat/Ljudjagare
Merge branch 'master' of https://github.com/Akodiat/Ljudjagare
Merge branch 'master' of https://github.com/Akodiat/Ljudjagare
written on the report
fixed conflicts
Merge branch 'master' of https://github.com/Akodiat/Ljudjagare