design 2(almost done) finished 4-5 pages
Merge remote-tracking branch 'origin/master'