midas/midaswiki @ b67104fe9161e3866dfcdb1a4316224f48cfe543

Justin Gilman b67104fe91 Merge branch 'master' into readonly		6 anni fa
..
marked-0.3.6	5d33f7391a initial commit	7 anni fa
ajax.js	3a29084fa2 fixing issues with IE11	6 anni fa
materialize.js	fec3f2b484 adding in gitnormalize; adding in material styling	7 anni fa
materialize.min.js	fec3f2b484 adding in gitnormalize; adding in material styling	7 anni fa
midaswiki.js	189c2dc284 disabling editor, adding in some link examples, updating readme	6 anni fa