profile template
Merge branch 'master' of https://github.com/jennywen/j3 into jenny
buttons
merge conflict fix
Merge pull request #7 from jennywen/jenny

merging