merged
Merge branch 'master' of github.com:erasmospunk/coinomi-website