in the middle of markers
merge conflicts fixed
screenshot added
Merge pull request #115 from kyledaugherty/take_out_placeholder_values

Take out placeholder values