Old code

written by Phillip Delgyado
Merge remote-tracking branch 'origin/old_version'

Conflicts:
	.gitignore