ignore
ignore
Merge branch 'master' of https://github.com/radogado/template

Conflicts:
	.DS_Store