manual merge of chrisalcantara PR 13
Merge branch 'master' into gh-pages

Conflicts:
	css/ufspj.css
Merge pull request #14 from ufjschool/gh-pages

manual merge of chrisalcantara PR 13