Moving some files around.
Merge branch 'master' of github.com:kb19/algorithmsAndDataStructures

Conflicts:
	src/AmazonQuestion.java