git ignore and workspace on static_pages branch
Merge branch 'master' into static-pages

Conflicts:
	.gitignore
	.idea/workspace.xml
add new static pages and routes
make a few updates just playing
just fooling around. Merge branch 'static-pages'