new pages

new pages
Merge branch 'pr/6'

Conflicts:
	.DS_Store
	images/.DS_Store