Modified index.html.ja
Make Japanese HTML file an English HTML file
Resolve conflict making Japanese HTML file an English HTML file
Removing Japanese HTML file
Modified index.html.ja
Merge branch 'master' of /home/mpopp/stuff/github

Conflicts:
	index.html.ja
Lets delete index.html.ja for real
Revert "Lets delete index.html.ja for real" with yet another modification

This reverts commit 6883740cbf6254db7bea38373fc9d2046a3b0283.
Moving HTML files into html directory
Moving HTML files into html directory
Merge branch 'master' of /home/mpopp/stuff/github
Deleting html directory, moving .txt file into txt dir
Merge branch 'master' of /home/mpopp/stuff/github
Remove remaining .txt files into txt directory too