Testing Authorea
Merge branch 'master' of github.com:wd15/PyMKS-ICME-2015

Conflicts:
	abstract.md
	introduction.md
	results.md