first commit after destroying old ficandfunc
commit before moving index to aaronkai.github.com
Merge branch 'master' of github.com:aaronkai/ficandfunc

Conflicts:
	index.php
	index.v2.php
	latest.zip
	resume.pdf