Merge pull request #18 from JALsnipe/master

proto looking good for presentation 3.
Merge pull request #19 from JALsnipe/master

new target database, work on archers
Toolbar working.
Merge pull request #20 from dgarzon/master

Toolbar working.
fix before merge'
merge
merge before toolbar work