Merging
Merging, again
Merge branch 'master' of https://github.com/Spike121/INB302CapstoneProject

Conflicts:
	RecommenderAttacksAnalytics/src/main/java/com/codetrix/App.java
	RecommenderAttacksAnalytics/target/classes/com/codetrix/App$1.class
	RecommenderAttacksAnalytics/target/classes/com/codetrix/App.class

	RecommenderAttacksAnalytics/target/classes/com/codetrix/model/AbstractModel.class

	RecommenderAttacksAnalytics/target/classes/com/codetrix/ui/MainAppFrame$1.class

	RecommenderAttacksAnalytics/target/classes/com/codetrix/util/DatabaseInfos.class