changed margins and borders
changed margins
changes to margins
Merge branch 'master' into gh-pages

Conflicts:
	.idea/workspace.xml
added footer