test 2
fixed merge error

Conflicts:
	src/Math_practice_problems_main.java
Merge branch 'master' of https://github.com/mpearce25/Math-Practice-Problems

Conflicts:
	src/Math_practice_problems_main.java
Merge branch 'master' of https://github.com/mpearce25/Math-Practice-Problems