Merge pull request #5 from milanij/jamesbranch

Jamesbranch
adds more views for users [edit, show, index]. implements search