Restructured Part 1 of MP2
Added netbeans to gitignore
Added the war game as Part2
Fixed a conflict in unimportant file