updated login
add files
add files
Merge remote-tracking branch 'origin/master'

Conflicts:
	fonts/260C12_2_0.eot
	fonts/260C12_2_0.ttf
	fonts/260C12_2_0.woff
	fonts/26242B_0_0-.eot
	fonts/26242B_0_0.ttf
	fonts/26242B_0_0.woff
	fonts/281D5A_0_0-.eot
	fonts/281D5A_0_0.eot
	fonts/281D5A_0_0.ttf
	fonts/281D5A_0_0.woff
	img/family2.jpg
	img/lowfat2.jpg
	img/menu.jpg
	img/towel.png
	login.html
add files