combined branches

merging numbers and master