update
merge conflicts
Search Funcitonality
Merge branch 'bulletinform'

Conflicts:
	.idea/misc.xml
	cs3240project/__init__.pyc
	cs3240project/settings.pyc
	cs3240project/urls.pyc
	cs3240project/wsgi.pyc
	db.sqlite3
	sprint1/__init__.pyc
	sprint1/admin.pyc
	sprint1/forms.pyc
	sprint1/migrations/0001_initial.pyc
	sprint1/migrations/0002_auto_20141111_1639.pyc
	sprint1/migrations/0003_auto_20141115_1728.pyc
	sprint1/migrations/0004_auto_20141115_1732.pyc
	sprint1/migrations/0005_users_p_salt.pyc
	sprint1/migrations/__init__.pyc
	sprint1/models.pyc
	sprint1/urls.py
	sprint1/urls.pyc
	sprint1/views.pyc
Merge branch 'master' of https://github.com/helenhe/cs3240-f14-team02