first commit to setup files
update readme
fix merge conflicts
Merge pull request #2 from tsamb/SRB/new_files

Srb/new files