Updated with gitflow and github stuff