deleted practice code from controllers
gibberish for branching practice
merge conflict practice
merge conflict practice 2
practicing merges