merge comflict
Merge branch 'master' of github.com:TomConlin/trouble_w_triples