ping
basic functionality
removed <<HEAD>>
changed database.yml