commit during integration1

trying to integrate Jared, Raymond and my apps together