initial commit of files
updated readme
adding python, sql files
removing non-git files
changing notes to create conflicts
adding notes on git
merging notes file from remote
Merge branch 'master' of https://github.com/anbh/swcarpentry-uw-material

Conflicts:
	README.md