start working on patch
Merge branch 'master' of github.com:jakebolewski/test

Conflicts:
	src/patch.jl
start working on patch