first commit
Merge branch 'master' of https://github.com/NextFab/nextfab-classes into gh-pages

Conflicts:
	index.html
	style.css

"My message"
Ed upload 1f