Upgrading to Cedar-14
Merge branch 'master' of github.com:smithad15/fringe_finder