Merge pull request #37 from wroy/master

Fixing Winter's merge conflicts
Added triangle checking function
Merge pull request #38 from Gerb11/master

Added triangle checking function
adding level loading for premade and random levels from menu