updaetd merger
added export
Merge branch 'master' of https://github.com/concepticon/concepticon.github.io
added merge