views littl changes
test-fahime
merg conflict
test-fahime
removing unnecessary settings file
view merg conflict
test-fahime
Merge branch 'develop' of https://github.com/redapesolutions/jatomidjango into develop
new stylishit folders for templates
some left styles to add newly
settings page styles bak
Merge branch 'css_files_differentiation' into develop
Merge branch 'css_files_differentiation' into develop
Removing duplicate stylesheets
Merge branch 'develop' of github.com:redapesolutions/jatomidjango into develop
Merge branch 'develop' into top-up
Fixing merge conflicts