Din
Merge branch 'firstmerged' of https://github.com/wsheppard/ecd2012 into firstmerged