Testing how to merge branches

made changes to files on my branch... and will merge to master later.