commit before merge
Merge branch 'master' of github.com:halldorel/hv1
Merge branch 'master' of github.com:halldorel/hv1
json response
Merge branch 'master' of github.com:halldorel/hv1FHSLy