Fixed gitignore
Merge branch 'master' of https://github.com/jhollister/UILabs

Conflicts:
	.idea/workspace.xml