Added links controller and link crud views
fixed merge
Merge branch 'taylorchiu-master'