changes
logo change
no message
Merge branch 'master' of https://github.com/dordal/userballot

Conflicts:
	server_app/views/home.blade.php
Merge branch 'dmccarthy-www' of https://github.com/dordal/userballot
merged develop

Merge branch 'develop'
more deletes
removed stuff checked into vendor directory