update location relation to user

user now prompted to edit their location if they have a location, to create a location if they do not
update readme to markdown
Merge branch 'development' of https://github.com/catburston/townbikes into foundation
fix github branch issue
Merge pull request #16 from catburston/development

Pull dev to master