moving around intro/results stuff
fixed diamond bug
Merge branch 'master' of github.com:PossibleWhale/Sheared