Checking out branch
Checking out branch
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git
Merging
Merge branch 'master' of https://github.com/nlubczynski/DesignProject.git
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git
Merge branch 'master' of https://github.com/nlubczynski/DesignProject.git
Merged
Merge branch 'master' into bradenTemp

Conflicts:
	DesignProject/bin/.gitignore