Trivial.
Merge branch 'master' of github.com:taystack/website
Woah.
And woah.
Merge branch 'temp' of github.com:taystack/website
Yeah, this just happened.
wtf mate?