initial commit
user scaffold
application html2haml
add h1
doctype
try styles
try styles
Merge /home/zeal/testapp into develop

Conflicts:
	app/assets/stylesheets/blocks/structure.scss.erb
	app/views/layouts/application.html.haml
try ajax
Merge /home/zeal/testapp into develop

Conflicts:
	app/views/layouts/application.html.haml
try ajax
merge
add top nav layout
begin styles top nav
fix spaces
delete js
Gemfile sintax change
devise added
change migration
Model works added