PUll
Merge branch 'master' of https://github.com/EyeWumbo/ICS_Project_2

Conflicts:
	Bridge.hpp
	a.out
	bridge.cpp
Merge branch 'master' of https://github.com/EyeWumbo/ICS_Project_2

Conflicts:
	Bridge.hpp
	a.out
	bridge.cpp