The program as it is so far
Renamed project name to Obsidian
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore