4 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
climbalimaandGitHub	b085a34506	fixed readme conflicts	2016-11-16 20:44:49 -05:00
climbalimaandGitHub	bce6e52391	fixed conflict	2016-11-14 23:08:10 -05:00
climbalimaandGitHub	dd22c787b8	fixed extra paste	2016-11-14 23:05:37 -05:00
climbalimaandGitHub	79f82d3d80	returned to o	2016-11-10 18:43:31 -05:00