Revert "cleanup"

This reverts commit f8e51a81dee6aed0889baa030c77500158ec5583.

Conflicts:
	.gitignore
Merge branch 'master' of github.com:gavriguy/fr2

Conflicts:
	.gitignore