Added README file
Did a thing
Added files
Modified file1
Changed file2
started cool feature
changed README again
????
Merge branch 'cool_feature'

Conflicts:
	README.txt
File2 modified
Added the next line to file3
Merge branch 'master' of https://github.com/Meliis/Hello-Fullstack
Got rid of other README