removed the dtatbase from the stage area. Hopefull this will prevent the database from being commited every time it changes. THis does however mean that the database will need to be manually included into the commit if you have made any syntatical changes to it.

Signed-off-by: Gregory Klupar <Klupamos@gmail.com>
Readded db.sqlite. THe proper way to not commit a file is with the git update-index --assume-unchanged <file> command
Added a config file (crete_config_file probaly not needed any more)
Attpempt to merge branches....
Merge remote-tracking branch 'remotes/origin/Working_model_branch' into Config_file
Merge branch 'Config_file' into views_n_templates


Signed-off-by: Gregory Klupar <Klupamos@gmail.com>