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

As a dynamically generated binary database file, this does not belong in
version control. If a particular version of it is needed, please
checkout the appropriate commit, import database_creation, and run
loadDatabase()
Merge branch 'orm'
Merge branch 'master' of github.com:hall5714/Freedom-Galaxy

Conflicts:
	fitg/backend/data/Freedom.db
added data directory
major fixes to movement implementation
Egrix partially completed. Monsters still need to be built.
Flight to Egrix completed, ready for any modifications.
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