work in progress...
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
merge conflict fixed
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
Merge branch 'master' of github.com:mircealungu/Zeeguu-Web
fixed merge conflict in index