added models and views
updated gitignore
updated with hw7 files
Merge branch 'staging'