radu/Django-Hackathon-Starter: A boilerplate application for Django web applications. @ a1bcbca275456af4ac58c5991cfdc98e9aea95f0

mk200789 aff14c69fc ionic: modify instagramUser template to display instagram user's images, controller, and factory		10 lat temu
..
app.js	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	10 lat temu
controllers.js	aff14c69fc ionic: modify instagramUser template to display instagram user's images, controller, and factory	10 lat temu
services.js	aff14c69fc ionic: modify instagramUser template to display instagram user's images, controller, and factory	10 lat temu