commit
last
Merge branch 'master' of https://github.com/edunn39/zenstork

Conflicts:
	css/style2.css