pers bikes
Merge branch 'master' of https://github.com/jamessq714/jamessq714.github.io

Conflicts:
	.DS_Store
	GA_FEWD/final_project/.DS_Store
	GA_FEWD/final_project/per's_bikes/.DS_Store
	GA_FEWD/final_project/per's_bikes/images/.DS_Store
	GA_FEWD/final_project/per's_bikes/js/.DS_Store
	GA_FEWD/final_project/per's_bikes/tours/.DS_Store
	GA_FEWD/homework/final project/README.md
	GA_FEWD/homework/final project/css/reset.css
	per's_bikes/.DS_Store
	per's_bikes/README.md
	per's_bikes/css/reset.css
	pers_bikes/final project.1/README.md
	pers_bikes/final project.1/css/reset.css
	pers_bikes/final project.1/images/.DS_Store