blanked out styles
.gitignore stuff
Merge branch 'dev-branch' of https://github.com/ColeTownsend/skriva into dev-branch

Conflicts:
	.gitignore