gitignore the .idea folder (phpstorm)
Add plupload with a basic uploader

the basic uploader doesn't do anything yet
Resolve index conflict and commit missing uploader example pieces

Resolve Conflicts:
	index.html