Initial commit
fixing fast forward
really fixing fast forward?