Use trilan email
Merge branch 'master' of github.com:xobb1t/ddash2013