Jam wars return of the hipster

Merging our work for sprint 4: jam wars: return of the hipster