Commit local changes before commit
Completed merge
commit merged files

Squashed commit of the following:

commit 2c93145d864164921b0a611709ad6128ecda1b20
Author: Matt Stevens <majold604@gmail.com>
Date:   Sun Oct 26 18:24:26 2014 -0400

	added method to logger to clarify type of standup

commit b22092be2f79d23df8c0fe593c2a77eae7015b9c
Author: Matt Stevens <majold604@gmail.com>
Date:   Sun Oct 26 18:18:46 2014 -0400

	Removed outputs
Merge branch 'master' of github.com:skkroh/life-simulation

Conflicts:
	src/Employee.java
	src/Logger.java