minor changes to the about, contact, portfolio.js, and application.css
Merge branch 'master' of https://github.com/netinept/Photography

pull from github to merge remote changes
Merge branch 'master' of https://github.com/netinept/Photography
Merge branch 'master' of https://github.com/netinept/Photography
resolved conflict with gem lock file
Merge branch 'master' of https://github.com/netinept/Photography