Template added and view modified
Merge branch 'master' of github.com:ishaan1/tweeter