Design...
mergeMerge branch 'master' of github.com:kmmbvnr/ecahack2013
Design
merge
small fixes