updated the basic models.py and played around with admin module
merging changes