,
Merge remote-tracking branch 'origin/master'

Conflicts:
	Olympic-2014/Practices Level 1-5.md