problem 76-78, 78 as a brute force
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore