conflict_
Merge remote-tracking branch 'origin/master'

Conflicts:
- example_code.txt
final version

Ayee