Prepare to pull github version from home.
Merge branch 'master' of github.com:strow/highrescris

Conflicts:
	.gitignore
Major changes, close to ready??