merge conflicts
notecard formatting
Id-->id
Updated the author table mysql script.
Merge branch 'dev' of github.com:dannythorne/HenkelNotecards into dev
routine
merge conflict resolution
Merge branch 'dev' into laura_dev