updated
Merge branch 'master' of github.com:kmmurphy88/packerpro
fixed confict
updated links
Merge pull request #6 from NMVO/links

Links