deleted practice code from controllers
gibberish for branching practice
merge conflict practice
merge conflict practice 2
practicing merges
got rid of merge conflict practice code
removed practice code
Merge pull request #4 from jpark1120/master

remove practice code