ready for ajax merge
Merge branch 'master' of github.com:betweenparentheses/assignment_ajax_puppies
puppifying