added stuff to gitignore
Merge branch 'master' of https://github.com/codemickeycode/pysomething
Merge branch 'master' of https://github.com/codemickeycode/pysomething
Merge branch 'clau'
Added image upload
added fonts
added assets files
added static admin files
added template for index page
changed base html from frontend layout
updated git ignore
added project/static/assets
added link to  views
Update .gitignore

fixed merge conflict
added url link to index
Merge branch 'master' of https://github.com/codemickeycode/pysomething into clau