new file:   .gitattributes
	modified:   lims/lims/lims.db
	modified:   lims/lims/templates/login.html
	new file:   lims/lims/templates/normal_user/allbook.html
	modified:   lims/lims/templates/normal_user/base.html
	new file:   lims/lims/templates/normal_user/borrow.html
	new file:   lims/lims/templates/normal_user/information.html
	modified:   lims/lims/templates/normal_user/test.html
	modified:   lims/lims/urls.py
	modified:   lims/lims/views.py
	modified:   lims/normal_user/urls.py
	new file:   lims/normal_user/util.py
	modified:   lims/normal_user/views.py
Merge branch 'master' of https://github.com/Bolsheviki/Team01-LIMS

Conflicts:
	lims/lims/lims.db
	lims/lims/templates/login.html
	lims/lims/urls.py
	lims/lims/views.py

	modified:   README
	deleted:    clean.sh
	new file:   lims/book_admin/forms.py
	deleted:    lims/book_admin/tests.py
	modified:   lims/book_admin/urls.py
	new file:   lims/book_admin/util.py
	modified:   lims/book_admin/views.py
	modified:   lims/counter_admin/urls.py
	modified:   lims/counter_admin/views.py
	modified:   lims/db/admin.py
	modified:   lims/db/models.py
	modified:   lims/dbAddData.py
	modified:   lims/dbUserDebug.py
	new file:   lims/debugBook.py
	new file:   lims/debugDict.py
	modified:   lims/lims/forms.py
	deleted:    lims/lims/media/image/2012/05/23/buffer.txt
	deleted:    lims/lims/media/image/2012/05/23/buffer_1.txt
	deleted:    lims/lims/media/image/2012/05/24/music.txt
	deleted:    lims/lims/media/image/2012/05/26/test4.c
	deleted:    lims/lims/media/image/2012/05/26/vimrc
	modified:   lims/lims/settings.py
	new file:   lims/lims/templates/book.html
	new file:   lims/lims/templates/book_admin/add.html
	new file:   lims/lims/templates/book_admin/audit.html
	modified:   lims/lims/templates/book_admin/base.html
	new file:   lims/lims/templates/book_admin/book.html
	new file:   lims/lims/templates/book_admin/login.html
	new file:   lims/lims/templates/book_admin/remove.html
	new file:   lims/lims/templates/book_admin/search.html
	deleted:    lims/lims/templates/book_admin/test.html
	modified:   lims/lims/templates/counter_admin/base.html
	modified:   lims/lims/templates/counter_admin/test.html
	modified:   lims/lims/templates/loggedin.html
	modified:   lims/lims/templates/login.html
	modified:   lims/lims/templates/pagenation.html
	deleted:    lims/lims/templates/search-base.html
	modified:   lims/lims/templates/search.html
	new file:   lims/lims/templates/settings.html
	new file:   lims/lims/templates/user_admin/add.html
	modified:   lims/lims/templates/user_admin/base.html
	new file:   lims/lims/templates/user_admin/batch_handle.html
	new file:   lims/lims/templates/user_admin/info_user.html
	new file:   lims/lims/templates/user_admin/login.html
	new file:   lims/lims/templates/user_admin/remove.html
	new file:   lims/lims/templates/user_admin/search.html
	new file:   lims/lims/templates/user_admin/settings.html
	modified:   lims/lims/templates/user_admin/test.html
	modified:   lims/lims/urls.py
	modified:   lims/lims/util.py
	modified:   lims/lims/views.py
	new file:   lims/user_admin/forms.py
	modified:   lims/user_admin/urls.py
	new file:   lims/user_admin/util.py
	modified:   lims/user_admin/views.py