ultima version 2014
Merge branch 'master' of github.com:mattgaviota/stone