First commit
Merge https://github.com/SanicEggnog/pasta