Merge pull request #32 from paulhyunkim/stylebranch

Stylebranch
Current code
Current code
Fix clearfix call
Merge branch 'master' into hannah_deploy
Move files
Move files
Accidental commit
Fix asset urls
Merge branch 'master' into hannah_deploy
Merge pull request #33 from paulhyunkim/hannah_deploy

Hannah deploy
move album
Fix js to interpret domain
Fix token
Fix assets
alert boxes
Deployed
Merge pull request #34 from paulhyunkim/aarontsangbranch

Aarontsangbranch -- most updated copy.
resolved conflicts