formatting
Added transaction loading
Merge branch 'master' of github.com:nyson/db-assignment1