commit
commit
Merge branch 'master' of https://github.com/rishabhtayal/Golf

Conflicts:
	Golf/.DS_Store