Minor Changes
Merge branch 'master' of https://github.com/srishti-g/SearchProject

Conflicts:
	app/script/cosineSimilarity.pyc
	app/script/searching.pyc
	app/views.py
	app/views.pyc