trying to revert changes
Merge branch 'master' of github.com:WheatonWHALE/TheWhaleNamedTiberius

Conflicts:
	Bears/models/bear.js
	Bears/server.js
reverted the changes