changed README
added new file
finished the new feature
Merge branch 'new_feature'

Conflicts:
	index.html
add another file
c5
c6
c7
c8
c9
c3
c4
c10
adding c5
Merge branch 'c5'
Merge branch 'master' of https://github.com/ksob/playing-with-git
Merge again branch 'master' of https://github.com/ksob/playing-with-git
gitignore
asfd
cleanup