Finished adding new guns
Merged previous
Healthbars and bugfixes
Merge