even more edits
Merge branch 'master' of https://github.com/cguanzon/goss into bootstrap-this-shit
hay nako merge ulit
Merge pull request #15 from cguanzon/bootstrap-this-shit

Bootstrap this shit
fixes conflicts