LIB
lib
Commit 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/index.html
index
mais 1