update gitignore
store ui
Merge branch 'master' into kj

Conflicts:
	index.html
update ui
send facebook data to WriteData.php
Merge branch 'master' of https://github.com/YoDoLab/Frontend

Conflicts:
	WriteData.php
	index.html
Merge branch 'neal' of https://github.com/YoDoLab/Frontend into neal

Conflicts:
	WriteData.php
Merge branch 'master' into neal

Conflicts:
	WriteData.php
refactor