ajaxy login
removed extraneous files
Merge remote-tracking branch 'upstream/master'
something did not get pushed
phil