Merge pull request #3 from jennywen/juliet

renamed controllers and other objects
stylez
merge conflict fix
Merge pull request #4 from jennywen/jenny

stylez
Revert a3dcffc..797a8fb

This rolls back to commit a3dcffcf888addd986aff54c1605a387bba3d676.
Revert 797a8fb..8e63f52

This rolls back to commit 797a8fbe8b318b51dc721d5407a0c7f41a581598.
ugh, i fixed everything
stuff
poop
merged poop
profile partial
Merge pull request #5 from jennywen/jenny

partial - profile
angularize templates
Merge branch 'master' of https://github.com/jennywen/j3 into juliet
fixed alignment in leaderboard