3 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
arcadius3d	7783e317fa	Update my fork with changes from local repo	2017-06-15 22:18:43 -03:00
arcadius3d	2087293035	Resolved conflict in index.html by combining both explanations	2017-06-15 22:01:24 -03:00
arcadius3d	912c21cc2c	Fixed merge conflicts	2017-06-15 21:51:07 -03:00