Team Assignment #5
Merge origin/master

Conflicts:
	DaenirisTheForgotten/src/daeniristheforgotten/DaenirisTheForgotten.java
Individual Assignment #5
Individual Assignment #6