Merge finished
git ignore add x86

Signed-off-by: Bill Beers <nothingatall544@gmail.com>