xxl, xl to x, xx
cleaned
s1base removed
Merge pull request #15 from johnearle94/master

xxl, xl changed to xx, x