changes
newest app
added ignore file
resolved merge conflicts