working progress

Board is working (I'm pretty sure)
started solver
git's default editor should be vim instead of vi
Merge branch 'master' of https://github.com/wmax641/unicorns

Conflicts:
	Board.java
	Solver.java
	Tester.java
	Tile.java