templates finished
Merge branch 'master' of github.com:KKoosha/Book-sharing-IUST

Conflicts:
	webapp/books/views.py~
	webapp/mysite/settings.py
	webapp/mysqlite.db
	webapp/templates/UserReg/register.html
	webapp/templates/UserReg/register.html~

merge conflict dealt