Merge branch 'master' of https://github.com/bgoerdt/vsr-lighten-the-load-web-app into missionPlanOutput
Merge branch 'master' of https://github.com/bgoerdt/vsr-lighten-the-load-web-app into missionPlanOutput
working on final touches
changed create new on all index pages
Rules file
Merge branch 'master' of https://github.com/bgoerdt/vsr-lighten-the-load-web-app into missionPlanOutput

Conflicts:
	MissionPlanningWebApp/MissionPlanningWebApp/App_Data/LtLDb.mdf
	MissionPlanningWebApp/MissionPlanningWebApp/App_Data/LtLDb_log.ldf
	MissionPlanningWebApp/MissionPlanningWebApp/Views/Warfighter/Index.cshtml
finished final changes
Fixed fighter error and styled equip index page
Merge pull request #32 from bgoerdt/missionPlanOutput

Mission plan output
Merge branch 'master' of https://github.com/bgoerdt/vsr-lighten-the-load-web-app into final_distribution

Conflicts:
	MissionPlanningWebApp/MissionPlanningWebApp/App_Data/LtLDb.mdf
	MissionPlanningWebApp/MissionPlanningWebApp/App_Data/LtLDb_log.ldf
	MissionPlanningWebApp/MissionPlanningWebApp/Controllers/FighterController.cs
	MissionPlanningWebApp/MissionPlanningWebApp/Mission Data/Rules_Distribution.txt
	MissionPlanningWebApp/MissionPlanningWebApp/Models/DistributionResults.cs
	MissionPlanningWebApp/MissionPlanningWebApp/Views/DistributionRules/Index.cshtml
	MissionPlanningWebApp/MissionPlanningWebApp/Views/Home/Index.cshtml
Merge pull request #34 from bgoerdt/final_distribution

Final distribution
Test fix
Merge branch 'master' of https://github.com/bgoerdt/vsr-lighten-the-load-web-app into Write_warfighters_to_file_with_formatting

Conflicts:
	MissionPlanningWebApp/MissionPlanningWebApp.Tests/Models/FighterTest.cs
	MissionPlanningWebApp/MissionPlanningWebApp/Views/Warfighter/Index.cshtml