before design integration
Merge branch 'master' of https://github.com/SyntaxError2013/Ed-Edd-Eddy
Merge branch 'master' of https://github.com/SyntaxError2013/Ed-Edd-Eddy
design done