Merge pull request #17 from catburston/master

Pull dev to master
add styles for bike index
add styles for profile edit form
add styles for location forms
add styles for reservation index
improve navigation
add style to reservation status
Merge branch 'development' of https://github.com/catburston/townbikes into development
update style of bike/res
update bicycle page styles
update location page styles
update reservation page styles
fix approved status style
Merge pull request #19 from catburston/development

Development to master