dns
much changes, very slideshow, need text, facebook working, wow
Merge branch 'jlpeyton' of github.com:gemisis/plain-green-tees into jlpeyton

merging from remote
Merge branch 'master' into jlpeyton

merging with master
merged changes with master