Testing out GitHub use; modified some files based on franco mako commits