Renamed files and began writting tests for database storatge
Added DataMapper as database, db migrations in rakefile and updated all relevant files
Resolving merge issues
Merge branch 'database_operations'