Setup

Setup
Setup

Setup
setup

setup
setup index

setup index
setup

setup
setup

setup
setup for templates

setup for templates
add gitignore

add gitignore
add templates dir

add templates dir
add jquery and bootstrap

add jquery and bootstrap
add js file, css file and creating templates test

add js file, css file and creating templates test
Small changes on tempts

Small changes on tempts
change gitignore
setup

setup
small changes

Small changes
Merge branch 'devo' of https://github.com/gunanpop/yiya into devo

Conflicts:
	YIYAWebsite/YIYAWebsite/__init__.pyc
	YIYAWebsite/YIYAWebsite/settings.pyc
	YIYAWebsite/YIYAWebsite/wsgi.pyc
	YIYAWebsite/templates/webmain/Base.html
	YIYAWebsite/webmain/__init__.pyc
	YIYAWebsite/webmain/models.pyc
	YIYAWebsite/webmain/views.py
resolving confilicts

resolving confilicts
morge
delete pyc
delete .gitignore

delete .gitignore