modified homepage
working dashboard
fix merge conflict
api
Merge branch 'master' of http://github.com/kjventura/admitone
Fix merge
bug-fix
added add function api_model.php
Merge branch 'master' of http://github.com/kjventura/admitone
semi-colon
add user to db