Maginot
P
Merge branch 'master' of https://github.com/ThatPerson/ElderNet

Conflicts:
	CVESimp/DBManager/database_stuff.py