modified files

squashed commits #1

demo

added hello.txt

new javascript added

jointhese files

modified index.js

modified another file

modified index.js

modified styles

my initial changes

modified index.php

modified

modified index.js

modified styles

modified index.php

modified

demo

done
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/plugins/custom-plugin/index.css
	wp-content/plugins/custom-plugin/index.js
	wp-content/plugins/custom-plugin/index.php