working on server, added database and ability to call php
fixed merge