fixed the cal post quality method
resolved the conflict
link to issue #100
added a missing url to my method sort_home_post
resolved the conflicts with models and urls
add the static files needed to base and renamed the file index
fixed awesomefont css and changed the pup dtae in index
resolved the conflicts
resolve conflict with base.html and urls.py
resolved the conflicts and addded the static files to base2.html and removed not needed urls
Merge pull request #162 from DinaSaad/C1_Beshoy_CalQualityIndex

C1 beshoy cal quality index