GLORIOUS!!!
Merge branch 'master' of https://github.com/chrishax/KevinFriedPig

Conflicts:
	src/com/fsu/kevinfriedpig/SearchView.java