testingnnnnn
first commit

testing it
4th time

try it
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/tax2014.java
merge it!
only notepad?
test open notepad with eclipse
where is notepad commits
feels like i messed this up
notapad change
Merge branch 'master' of https://github.com/JayGuan/Project

Conflicts:
	src/tax20141.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/JayGuan/Project
Merge remote-tracking branch 'origin/master'