removed another file
Merge branch 'master' of https://github.com/daveho/icer2013
added a discussion question
merge
fix merge conflict