Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Cosmetic Changes
Merge branch 'gh-pages' into development

Conflicts:
	.DS_Store
	index.html
Fixing Some small Issues
Merge branch 'development'