added encoding line in management.py
added files for Vagrant
Merge HEAD, branch 'master' of https://github.com/martflu/amanaman into comments
initial app commit
added some inital templating and modified view. added urls to show the view
Merge branch 'master' of https://github.com/martflu/amanaman into comments

Conflicts:
	AmanamanProjekt/urls.py
rudimentary implementation of relative posting time added
first working test added
Merge branches 'comments' and 'master' of https://github.com/martflu/amanaman into comments
testing overloading context in views
Merge branch 'master' of https://github.com/martflu/amanaman into comments_test
Merge branch 'master' of https://github.com/martflu/amanaman into comments_test
blub
Merge branch 'master' of https://github.com/martflu/amanaman into comments
views file formatted
form testing added + namespacing for views in urls.py
stuff cleaned up from testing, added "add comment" form
cleaned up testing stuff
Merge branch 'master' of https://github.com/martflu/amanaman into comments
added link in navigation