moved alert to below header
some change
merge fix
minor fix
merge fix
merge fix
Merge pull request #54 from RKim220/ryan

Ryan