recent/most viewed completed
updates
dbfile
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02

Conflicts:
	db.sqlite3
	sprint1/views.py
	templates/bdisplay.html
	templates/search.html