updated string parsing and imported the test database
Merge remote-tracking branch 'origin/master'

Conflicts:
	reader/views.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	reader/views.py
updated string parsing and imported the test database