added missing html tags
CSS: Added title box
Fixed conflict
Updated pages
Merge branch 'master' into html
Conflict Fix
finished adding content to pages
merged master
added images