Merge pull request #18 from jpark1120/master

merge conflict resolution for index and css
created a custom route to have separate ajax call for refill
Merge branch 'master' of github.com:LizCira/screen_test