TODO

Added todo
Merge branch 'master' into mauricio
Null exceptions

Check for nulls
Merge branch 'master' into mauricio
Changed Serializable interface

Changed it to return object as well as setting the current one’s
attributes
Merge branch 'master' into mauricio

Conflicts:
	src/views/GameFrame.java
Added toStrings serializable objects

toString returns a String :)
Merge branch 'mauricio'