This is the exercise 12 correct version for lab 1
There was an error with exercise 13, but i fixed it

Merge branch 'master' of https://github.com/victoriawt/git-exercise

Conflicts:
	src/edu/grinnell/csc207/tsouvict/hello/HelloWorld.java