old stuff but that need to be commited
Merge branch 'master' of https://github.com/alexveit/Honeycomb