added padding, removed duplicates
Merge branch 'master' of https://github.com/bbaumgar/circuits-with-friends