integrated codes and refactored functions.php
Merge pull request #10 from WhosOutThere/joshshuo5

integrated codes and refactored functions.php