yay
Merge https://github.com/gmicros/cs595-f14

Conflicts:
	LaTeX/CS495_assignment_1_George_Micros.log
	LaTeX/CS495_assignment_1_George_Micros.pdf