couple more options
Merge branch 'master' of https://github.com/jamessq714/jamessq714.github.io

Conflicts:
	.DS_Store
	homework/final project/.DS_Store
	homework/final project_3/images/.DS_Store
	pers_bikes/final project.1/.DS_Store
	pers_bikes/final project.1/README.md
	pers_bikes/final project.1/css/reset.css
	pers_bikes/final project.1/images/.DS_Store
	pers_bikes/final project.1/images/first_pic.jpg
	pers_bikes/final project.1/images/fourth_pic.jpg
	pers_bikes/final project.1/unused images so far/.DS_Store
	pers_bikes/final project.1/unused images so far/058.jpg
	pers_bikes/final project.1/unused images so far/logo.pdf
	pers_bikes/final project.1/unused images so far/logo2.png
	pers_bikes/final project.2/.DS_Store
	pers_bikes/final project.2/images/.DS_Store
	pers_bikes/final project.2/index.html