edit menu file
edit read me
edit database file
Merge branch 'master' of github.com:zhimengSun/aiphone

Conflicts:
	README.md
	app/views/shared/_menus.html.erb

	new file:   public/images/android.jpg
	new file:   public/images/iphone.jpg
	new file:   public/images/winphone.jpg