Merge
Refactored DatabaseConnection class and removed AFNetworking code
Merge
Refactored color method