starts assignment
rebases and starts second FIXME function
Merge pull request #1 from 100timesforever/feature/rebaseConnorsShit

Feature/rebase connors shit
Merged!