initial import
Merge branch 'master' of github.com:franklouwers/frank_workstation

Conflicts:
	README.md