Initial commit
Merge https://github.com/FallenShard/AIPSProj