Convert makefile spaces to tabs.
Fix syntax of "if" to match javascript
Merge branch 'fix_makefile' of https://github.com/wting/AoPL

Conflicts:
	makefile
Merge branch 'master' of github.com:w7cook/AoPL