added Sessions and Users controller closes #9 closes #6
fixed merge conflicts before pushing to master