Re-coding base.php
Merge branch 'master' of github.com:aristath/shoestrap