finished adding removeDevice functionality
updated gitignore on my end
resolved merge conflict