Moved some files.
Deleted some files.
Added some files.
Renamed some files.
Added a line
Merge branch 'new-feature'
This is Ernesto's project. :)
This is MINE. >:(
Merge branch 'new-feature'

Conflicts:
	README.md