Initial working
Merge branch 'master' of github.com:knownasilya/selah

Conflicts:
	.gitignore