0b1

Start creating database
0b2
solve conflict

Conflicts: js/scripts.js