no message
Merge branch 'static-pages'

Conflicts:
	.idea/workspace.xml
ignore .diea
latest static page made dynamic
no message
Merge branch 'master' into static-pages

Conflicts:
	.gitignore
	.idea/workspace.xml