Merge pull request #9 from catalincatana/master

butt7
indi
scripti
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
index
Merge pull request #5 from serbanu/master

change