Merge pull request #73 from camilin87/kmoya-dev-branch

Kmoya dev branch merged to master branch
User View Init
Merge branch 'master' of https://github.com/camilin87/senior_project
Merge pull request #81 from camilin87/master

Merge last changes to my branch