Merge branch 'master' of https://github.com/nickjvm/Design-Assign

Conflicts:
	.gitignore