Added Conclusions chapter
Merge branch 'master' of https://github.com/petmakris/thesis-webapp-spring-angularjs
Merge branch 'master' of https://github.com/petmakris/thesis-webapp-spring-angularjs