# Udacity FullStack NanoDegree Project:
## Blog

### Iteration 1
* Basic blog
* Requirements:
<<<<<<< HEAD
	* Front page that lists entries
	* Form to submit new entries
	* Permalink page for entries
=======
	* 1 
>>>>>>> a5d140e2d483bb7b2bea9ea937f53622bf62a044


### Built with
* Python
* Google App Engine
* Jinja2 templates

## Status
* Basic blog: WIP

## Demo
**To Do** add demo url once livee

# Udacity FullStack NanoDegree Project:
## Blog

### Iteration 1
* Basic blog
* Requirements:
	* Front page that lists entries
	* Form to submit new entries
	* Permalink page for entries

### Built with
* Python
* Google App Engine
* Jinja2 templates

## Status
* Basic blog: WIP

## Demo
**To Do** add demo url once livee

Tidy up after merge conflict
docs: Tidy up after merge conflict