change
solve confilct
add key
conflict
solve conflict
same
Merge branch 'master' of github.com:chris19891128/EECS394

Conflicts:
	js/parse/homepage.js