more problems
Merge branch 'master' of https://github.com/dabaitu/300 into tom

* 'master' of https://github.com/dabaitu/300:
  more problems
stuff