update attributes
Merge branch 'master' of github.com:rcrespo9/philosophy into joe-branch
merge almost complete
parallax css minor changes