add Waldo
Update authorized_keys
added Marco M's key
Merge pull request #48 from samstav/addwaldouser

add Waldo
Resolving merge conflict w/ Nielsen
Merge branch 'niven01-master'
Resolve Marco M merge conflict
Merge branch 'marcoamorales-patch-1'
Add Macbook
Fix merge conflict
Merge branch 'niven01-master'
Add another key for Jimmy
Merge pull request #52 from rackops/JimmyP

Add another key for Jimmy
Add BK
Merge pull request #53 from gondoi/master

Add BK
lost my key on the bastion ... :(
Merge pull request #54 from Helmut-RS/master

lost my key on the bastion ... :(
Added Jens' public key
Update authorized_keys

Adding key
Merge pull request #56 from josh447/patch-1

Update authorized_keys