add 12
add num
asdf
changed again
Merge branch '2'

Conflicts:
	src/12.txt
Merge pull request #1 from jinwow/master

added examples