added views and templates for the django project
asdf
merging conflicts, no changes were made
need to include bower components in repository - change git ignore
not tracking gruntfile - this file should be specific to machine
trying to add gruntfile.js to ignore files
fixed cloud9 and added system cloud9 files to be ignored
Merge branch 'master' into make-django-work
make the project work on django
removing c9revision from repository
Merge branch 'flatpage' of github.com:ywarezk/nerdeez-client into flatpage
removed the orig files
added *.orig to the ignore file