modified:   ../2014_10/20141021.html
modified:   html5_template.html
deleted:    kama-3.jpg
modified:   markdown-style.css
modified:   ../../index.css
modified:   ../../testing/Diary.css
modified:   ../../testing/Diary.htm
modified:   20141021.md
modified:   ../../testing/Diary.css
modified:   ../../testing/Diary.htm
modified:   ../../testing/Diary.css
modified:   ../../testing/Diary.htm
modified:   ../../testing/Diary.css
modified:   ../../testing/Diary.htm
modified:   ../../testing/Diary.css
modified:   ../../testing/Diary.htm
modified:   ../../testing/Diary.htm

-webkit : chrome;
-moz	: firefox;
-o	: opera;
-ms	: ie;

added.
modified:   ../mainstyle.css
modified:   ../template/markdown-style.css

mainstyle.css
  * Delete ^M and ^I
  * filetype shiftJis -> utf8
  * fileformat dos -> unix

markdown-style.css
  * Delete box style css.
Merge branch 'newDiary'