Template #2
Merge branch 'master' of https://github.com/estnw/estnw

Conflicts:
	.DS_Store
Template #3