some edits and fixes

some edits and fixes
edit pages
Merge pull request #10 from delihiros/viewwork

edit pages
Merge pull request #9 from delihiros/niitsuwork

Niitsuwork
Merge branch 'master' of https://github.com/delihiros/design-project into onmemory
join
join