version 1.3-SNAPSHOT
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	css/apache-maven-fluido-1.3.1.min.css
	css/print.css
Merge branch 'gh-pages' of https://github.com/csc19601128/Phynixx into gh-pages