Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages

Conflicts:
	index.html
updated
changed margins
Merge branch 'master' into gh-pages

Conflicts:
	.idea/workspace.xml
added footer
changes to fluid grid
changes
Merge pull request #1 from firzhugh/gh-pages

update