fixed merge conflict
cleaned up files
fixed sign in status text, added <li>tags
adds phones controller, routes, and custom event text on map
Merge branch 'master' into Phones_Controller
Merge pull request #15 from ieatkimchi/Phones_Controller

Phones controller
edited view
Merge branch 'master' of https://github.com/ieatkimchi/Bike-1-1
update routes