Merged files from macbook air;
added google api key to local file rather than hard coding it