setting proj
css 3
cleaning project
fixed conflicts
Merge pull request #3 from sanic888/settingProject

Setting project