Tony has added his branch.
Merge branch 'tony'
Merge branch 'master' of github.com:jjlee5266/Where-Fi

Conflicts:
	README.md