Add template working
Merge branch 'b1' of https://github.com/raulmacarie/templates into b1
Add template working
First draft
Small changes
Small changes 2
UI Modifications
UI Modifications
UI Modifications
Merge branch 'mircea' of git://github.com/raulmacarie/templates into mircea

Conflicts:
	assets/less/style.less
Merge remote-tracking branch 'origin/b1' into mircea
asdadadsad
committt
git ignore
Merge branch 'b1' of https://github.com/raulmacarie/templates into mircea

Conflicts:
	index.html
	js/base.js
	js/ui.js
	mircea-s-index.html

ok
ok
fixed untracked files
Merge branch 'mircea'
merge the changes and update on git
Merge branch 'master' of https://github.com/raulmacarie/templates

Conflicts:
	js/base.js
resolving conflicts