Fixed some mistakes in the code; use makefile to build
Merge branch 'master' of https://github.com/shinyquagsire23/FR-IntroTemplate