Renaming files
Update sass files and Gemfile
Update Gemfile.lock
Updates..
Merge branch 'beta'