Commiting before merge
Merge branch 'based'

Conflicts:
	Files/Japanese/Konnichiwa.txt
	Files/Japanese/Sayonara.txt
	Files/languages.txt
fixed
Removed Database, got to based branch for that
Updated the database a bit.