added .set
ings, .project, etc
added sample2.txt
adde dfiles to .gitignore
added files
added .project, .settings, .classpath
Merge branch 'branch1'

Conflicts:
	.gitignore
dded .projects
added smaple12 and 13
added sample11
added sample10
Merge branch 'master' of https://github.com/seanc100/basil