Got Ajax working and css looking fab
fixed merge conflict in js document
Merge pull request #5 from armenvartan/matts_branch

Got Ajax working and css looking fab