database working
working on model and beginning controller
Merge branch 'model'