Merge pull request #1 from RobFone/master

Add stuff to newfile
Make my own change to newfile
merge updates from RobFone