Merge branch 'master' of /Users/tobbew92/Documents/workspace/avalgprj1 with conflicts.
The completed Miller rabbin added from private source