added stuff from this branch
more content
comiting before merging with interesting_stuff
commiting new content
commiting the merge from interesting to the MASTER