pull from openshift
sync with github
Merge branch 'master' of https://github.com/coursemdetw/2014cda
untracking pandoc generated files