first
Merge branch 'master' of https://github.com/BrianNewsom/Symblog2
Merge branch 'master' of https://github.com/BrianNewsom/Symblog2

Conflicts:
	.gitignore
second