Removed the hr tag and used some css for that
Changed the div id's
Added the form in modal
Merge branches 'dev' and 'heroku' into dev
Merge branch 'dev' of github.com:bharaththiruveedula/Map-your-friend into dev
Merge branches 'master' and 'dev'
Adjusted the size of buttons
Merge branch 'dev' of github.com:bharaththiruveedula/Map-your-friend into dev
Merge branches 'master' and 'dev'
Merge branches 'heroku' and 'master' into heroku