first commit
Second commit
Merge branch 'master' of https://github.com/arikalfus/Brandeis-JBS

Conflicts:
	.gitignore