adding comment on the head
conflict
fixing conflicts
change on the footer
angular commet added
Merge branch 'new_feature' of github.com:aradiquez/website into new_feature
comment on partial
Merge branch 'new_feature' of github.com:aradiquez/website into new_feature