File system ignored

System
Merge branch 'master' of https://github.com/mhkane/Computition

Conflicts:
	.DS_Store.REMOTE.67576.DS_Store