added ships
fixed minor merge conflict
added gitingnore file
add js to add player ships to DOM
fix css merge conflicts