Resolved conflict
Resolved conflict
Merge branch 'master' of https://github.com/icaruus/il12a
Merge branch 'master' of https://github.com/icaruus/il12a
Implemented createUser in DAO
Merge branch 'master' of https://github.com/icaruus/il12a