added new2
Merge branch 'master' of https://github.com/vigoway/trash_me into new_feature_2

merging newest changes from remote
add new feature 2 to master