Initial datastore architecture change
Remodel of the database
Merge with master
Change of database model
Modified mapreduce to work per line
Added upload.py
Modified regarding Sam's comments
Merge branch 'sams-review' into fourth_week_release
Improved docstring and removed TODO that was done