Resolving merge
Merge branch 'master' of https://github.com/cartesio88/DSProject1.git

Conflicts:
	DSProject1/src/DSProject/Constants.java