Merged with master

merged with master for updated homepage