change to show
resolve merge conflict
homepage changes
merge master branch
home page icon row
Merge branch 'master' into paul
home page styling
saturday morning commit
merge conflicts
resolve merge conflict with local master
order view pages
Merge pull request #23 from vivekmshah/paul

Paul
google maps rails controller integration
Merge branch 'james'
resolve merge conflict between james and master branch
Merge pull request #25 from vivekmshah/vivek

google maps rails controller integration
styling changes and heroku related changes
minor styling changes