Merge pull request #48 from vikinghug/development

Removed resizing
fixing shield bar bug