added to ignore
Merge branch 'master' of https://github.com/TagYourIt/OU-Flash-Vertical

Conflicts:
	.DS_Store
	.gitignore