first commit
Merge branch 'master' of github.com:LocalScholar/LoScho

Conflicts:
	.gitignore