add .swp files to .gitignore
Merge branch 'orm' of https://github.com/hall5714/Freedom-Galaxy into orm
Made changes to combat.py
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy into orm

Conflicts:
	fitg/backend/actions/combat.py
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy into orm
Military combat changes
Some Changes to mil combat
Merge branch 'orm'