Updated input parameters, randomizing base/exp
Merged pretty things together yay
Merge branch 'master' into mergeBranch

Conflicts:
	test.cpp