gitignore
gitignore
Merge branch 'master' of github.com:The-Duchess/CS300-BridgeControlSystem
Stuff
Merge branch 'master' into bajr

Conflicts:
	.gitignore