steve's views
merge with master
fixed merge
Merge pull request #3 from othullo/master

my pages