adds and stuff to hello world
Auto-Merge from feature-b: adds and stuff