Pull no meu notebook
Merge branch 'master' of
git@github.com:BrunoPereiraSantos/NewSinkBet.git

Conflicts:
	src/projects/defaultProject/appConfig.xml
	src/sinalgo/nodes/timers/Timer.java