deleted previous comment, added author comment
edited the derp comment to test merging
Trying to resolve conflict 1
Added date
Merge branch 'dev'
fixed merge issues