Added some stuff
Merge branch 'second_branch'

Conflicts:
	README.md