added modules
Merge branch 'master' of https://github.com/Apoyhtari/Loggerton

Conflicts:
	.gitignore