Initial commit
Merge branch 'master' of
https://github.com/KingMurlin/FrenchConjugator.git

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/KingMurlin/FrenchConjugator.git
Another test commit