merging
resolving merge
Merge branch 'master' of https://github.com/Caveat4U/is_it_feasible
removing shared links from views